X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=25b079de4b81368c2b4ffcc5b9c15d92507c868a;hb=8a271d9dd189f4d8f218d718f7285d7927c3d1ad;hp=6ed6fe454e7f4c918e882b584e2e3c3459018f04;hpb=69df712d1d06b2c698bed3de086b9f734de73b7e;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 6ed6fe454e..25b079de4b 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -23,21 +23,18 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include "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 */
@@ -47,33 +44,31 @@ enum fileio_access
 };
 
 struct fileio {
-	const char *url;
-	ssize_t size;
-	enum fileio_type type;
-	enum fileio_access access;
-	FILE *file;
+	/* 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, uint32_t position);
-int fileio_fgets(struct fileio *fileio, uint32_t size, char *buffer);
+int fileio_seek(struct fileio *fileio, size_t position);
+int fileio_fgets(struct fileio *fileio, size_t size, void *buffer);
 
 int fileio_read(struct fileio *fileio,
-		uint32_t size, uint8_t *buffer, uint32_t *size_read);
+		size_t size, void *buffer, size_t *size_read);
 int fileio_write(struct fileio *fileio,
-		uint32_t size, const uint8_t *buffer, uint32_t *size_written);
+		size_t size, const void *buffer, size_t *size_written);
 
 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 *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 */