X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=3f47cb9ba61bfa8cfb42bfd9de606a8e20d0f14d;hb=1712d7835e0fbba60d578b52b21b95b046805757;hp=5c0a88dae4146a502b0862e0f445bedf06c745fb;hpb=32c6d70f6acd41dd1af5ea73051dd6c8a46eac14;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index 5c0a88dae4..3f47cb9ba6 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,17 +26,9 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#define FILEIO_MAX_ERROR_STRING		(128)
-
 #include "types.h"
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#define FILEIO_MAX_ERROR_STRING		(128)
 
 enum fileio_type
 {
@@ -38,19 +36,6 @@ enum fileio_type
 	FILEIO_BINARY,
 };
 
-enum fileio_location
-{
-	FILEIO_LOCAL,
-/*
- * Possible future enhancements:
- * FILEIO_NFS,
- * FILEIO_BOOTP,
- * FILEIO_[XYZ]MODEM,
- * FILEIO_HTTP,
- * FILEIO_FTP,
- */
-};
-
 enum fileio_access
 {
 	FILEIO_READ,		/* open for reading, position at beginning */
@@ -63,28 +48,27 @@ enum fileio_access
 typedef struct fileio_s
 {
 	char *url;
-	char error_str[FILEIO_MAX_ERROR_STRING];
 	long long size;
 	enum fileio_type type;
-	enum fileio_location location;
 	enum fileio_access access;
-	void *location_private;
+	FILE *file;
 } fileio_t;
 
-typedef struct fileio_local_s
-{
-	FILE *file;
-	struct stat file_stat;
-} fileio_local_t;
+int fileio_open(fileio_t *fileio,
+	const char *url, enum fileio_access access, enum fileio_type type);
+int fileio_close(fileio_t *fileio);
+
+int fileio_seek(fileio_t *fileio, uint32_t position);
+int fileio_fgets(fileio_t *fileio, uint32_t size, char *buffer);
+
+int fileio_read(fileio_t *fileio,
+		uint32_t size, uint8_t *buffer, uint32_t *size_read);
+int fileio_write(fileio_t *fileio,
+		uint32_t size, const uint8_t *buffer, uint32_t *size_written);
+
+int fileio_read_u32(fileio_t *fileio, uint32_t *data);
+int fileio_write_u32(fileio_t *fileio, uint32_t data);
 
-extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written);
-extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);
-extern int fileio_seek(fileio_t *fileio, u32 position);
-extern int fileio_close(fileio_t *fileio);
-extern int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type);
-extern int fileio_read_u32(fileio_t *fileio, u32 *data);
-extern int fileio_write_u32(fileio_t *fileio, u32 data);
-	
 #define ERROR_FILEIO_LOCATION_UNKNOWN	(-1200)
 #define ERROR_FILEIO_NOT_FOUND			(-1201)
 #define ERROR_FILEIO_OPERATION_FAILED		(-1202)