X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=25b079de4b81368c2b4ffcc5b9c15d92507c868a;hb=665ac60ef0289ebc520126872efac6bbdf831f61;hp=10fa667d4d4febc70479cf46f9de7b9df8fe484b;hpb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 10fa667d4d..25b079de4b 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -23,21 +23,19 @@
  *   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 */
 	FILEIO_READWRITE,	/* open for writing, position at beginning, allow reading */
@@ -45,29 +43,32 @@ enum fileio_access
 	FILEIO_APPENDREAD,	/* open for writing, position at end, allow reading */
 };
 
-typedef struct fileio_s
-{
-	char *url;
-	long long size;
-	enum fileio_type type;
-	enum fileio_access access;
-	FILE *file;
-} fileio_t;
+struct fileio {
+	/* The structure is opaque */
+	struct fileio_internal *fp;
+};
+
+int fileio_open(struct fileio *fileio,
+		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);
+int fileio_fgets(struct fileio *fileio, size_t size, void *buffer);
+
+int fileio_read(struct fileio *fileio,
+		size_t size, void *buffer, size_t *size_read);
+int fileio_write(struct fileio *fileio,
+		size_t size, const void *buffer, size_t *size_written);
 
-extern int fileio_write(fileio_t *fileio, uint32_t size, const uint8_t *buffer, uint32_t *size_written);
-extern int fileio_read(fileio_t *fileio, uint32_t size, uint8_t *buffer, uint32_t *size_read);
-extern int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer);
-extern int fileio_seek(fileio_t *fileio, uint32_t position);
-extern int fileio_close(fileio_t *fileio);
-extern int fileio_open(fileio_t *fileio, const char *url, enum fileio_access access, enum fileio_type type);
-extern int fileio_read_u32(fileio_t *fileio, uint32_t *data);
-extern int fileio_write_u32(fileio_t *fileio, uint32_t data);
+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 */