X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=02592e28d0ed9e4df168d706dad1861b14a44d01;hp=8cba926a087eb1dc523bf1b3e3e94720eef55348;hb=6949b5393d9fb6511ddef13ce0bef1a147e7f962;hpb=da4cb3c029e7f271ee4fa7165ceefbef04d45e49

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 8cba926a08..02592e28d0 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -19,25 +19,20 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef FILEIO_H
-#define FILEIO_H
 
-#include "types.h"
+#ifndef OPENOCD_HELPER_FILEIO_H
+#define OPENOCD_HELPER_FILEIO_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,34 +41,30 @@ enum fileio_access
 	FILEIO_APPENDREAD,	/* open for writing, position at end, allow reading */
 };
 
-struct fileio {
-	char *url;
-	long long size;
-	enum fileio_type type;
-	enum fileio_access access;
-	FILE *file;
-};
+struct fileio;
 
-int fileio_open(struct fileio *fileio,
-	const char *url, enum fileio_access access, enum fileio_type type);
+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_feof(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, size_t *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 /* OPENOCD_HELPER_FILEIO_H */