X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=680bdd2b82d0cd23820f3a23476731b756f4ad7c;hb=e6733049224ea7becbc4f0e82f2d75e6393712f1;hp=40c4ef0e6d78ba96a495134cb7aa53f33146b307;hpb=3a693ef526575633cc350a69aa1a5d1f08e64c46;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 40c4ef0e6d..680bdd2b82 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -21,23 +21,20 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include <helper/types.h>
-
 #define FILEIO_MAX_ERROR_STRING		(128)
 
-enum fileio_type
-{
+enum fileio_type {
 	FILEIO_TEXT,
 	FILEIO_BINARY,
 };
 
-enum fileio_access
-{
+enum fileio_access {
 	FILEIO_NONE,		/* open without any access (invalid mode) */
 	FILEIO_READ,		/* open for reading, position at beginning */
 	FILEIO_WRITE,		/* open for writing, position at beginning */
@@ -46,14 +43,13 @@ enum fileio_access
 	FILEIO_APPENDREAD,	/* open for writing, position at end, allow reading */
 };
 
-struct fileio
-{
+struct fileio {
 	/* The structure is opaque */
 	struct fileio_internal *fp;
 };
 
 int fileio_open(struct fileio *fileio,
-	const char *url, enum fileio_access access, enum fileio_type type);
+		const char *url, enum fileio_access access_type, enum fileio_type type);
 int fileio_close(struct fileio *fileio);
 
 int fileio_seek(struct fileio *fileio, size_t position);
@@ -66,13 +62,13 @@ int fileio_write(struct fileio *fileio,
 
 int fileio_read_u32(struct fileio *fileio, uint32_t *data);
 int fileio_write_u32(struct fileio *fileio, uint32_t data);
-int fileio_size(struct fileio *fileio);
+int fileio_size(struct fileio *fileio, int *size);
 
-#define ERROR_FILEIO_LOCATION_UNKNOWN	(-1200)
-#define ERROR_FILEIO_NOT_FOUND			(-1201)
-#define ERROR_FILEIO_OPERATION_FAILED		(-1202)
-#define ERROR_FILEIO_ACCESS_NOT_SUPPORTED	(-1203)
-#define ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN	(-1204)
+#define ERROR_FILEIO_LOCATION_UNKNOWN			(-1200)
+#define ERROR_FILEIO_NOT_FOUND					(-1201)
+#define ERROR_FILEIO_OPERATION_FAILED			(-1202)
+#define ERROR_FILEIO_ACCESS_NOT_SUPPORTED		(-1203)
+#define ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN		(-1204)
 #define ERROR_FILEIO_OPERATION_NOT_SUPPORTED	(-1205)
 
-#endif /* FILEIO_H */
+#endif	/* FILEIO_H */