X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ffileio.h;h=a81f98ea2793058b11f35c2a7ca32ed8da5ab180;hb=68c598e88d5e09728ea845a81ab279c615bbaf0f;hp=c67be2c785b3a69a6cccd88f994824a5241dc16b;hpb=79f25814fe1b84e47d10d0063850062b1e65a9ed;p=openocd.git

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index c67be2c785..a81f98ea27 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     *
@@ -38,18 +44,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
 {
@@ -63,22 +57,15 @@ 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;
-} fileio_t;
-
-typedef struct fileio_local_s
-{
 	FILE *file;
-} fileio_local_t;
+} fileio_t;
 
 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_fgets(fileio_t *fileio, u32 size, u8 *buffer);
+extern int fileio_fgets(fileio_t *fileio, u32 size, char *buffer);
 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);