ARMv7-M: make DAP commands verify target is an ARMv7-M

[openocd.git] / src / helper / fileio.h

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 024ad0832b64673b6697c101419777c6746e6ae3..597bafc0124ae5c53934bb9f866d61f9f6b57284 100644 (file)
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -26,7 +26,7 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include "types.h"
+#include <helper/types.h>
 
 #define FILEIO_MAX_ERROR_STRING                (128)
 
@@ -38,6 +38,7 @@ enum fileio_type
 
 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 */
@@ -46,8 +47,8 @@ enum fileio_access
 };
 
 struct fileio {
-       char *url;
-       long long size;
+       const char *url;
+       ssize_t size;
        enum fileio_type type;
        enum fileio_access access;
        FILE *file;
@@ -57,13 +58,13 @@ int fileio_open(struct fileio *fileio,
        const char *url, enum fileio_access access, 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);