Remove redundant sys/types.h #include directives (now in types.h).

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

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index c047cb87aa029183dd9e78457fb4cdd5f2ef7eeb..c764082e9e37e1ebe349a94c10596685784f8d21 100644 (file)
--- 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     *
@@ -22,41 +28,19 @@
 
 #define FILEIO_MAX_ERROR_STRING                (128)
 
-/* make buffering of complete intel-hex format files optional
- * to account for resource-limited hosts
- */
-#define FILEIO_BUFFER_COMPLETE_IHEX
+#include "types.h"
 
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <sys/stat.h>
+#include <errno.h>
+#include <ctype.h>
 
-enum fileio_pri_type
-{
-       FILEIO_TEXT = 0x1,
-       FILEIO_IMAGE = 0x2,
-};
-
-enum fileio_sec_type
+enum fileio_type
 {
-       FILEIO_PLAIN = 0x10,
-       FILEIO_IHEX = 0x20,
-/*
- * Possible future enhancements:
- * FILEIO_ELF,
- * FILEIO_SRECORD,
- */
-};
-
-enum fileio_location
-{
-       FILEIO_LOCAL,
-/*
- * Possible future enhancements:
- * FILEIO_NFS,
- * FILEIO_BOOTP,
- * FILEIO_[XYZ]MODEM,
- * FILEIO_HTTP,
- * FILEIO_FTP,
- */
+       FILEIO_TEXT,
+       FILEIO_BINARY,
 };
 
 enum fileio_access
@@ -71,51 +55,21 @@ enum fileio_access
 typedef struct fileio_s
 {
        char *url;
-       char error_str[FILEIO_MAX_ERROR_STRING];
        long long size;
-       enum fileio_pri_type pri_type;
-       enum fileio_sec_type sec_type;
-       enum fileio_location location;
+       enum fileio_type type;
        enum fileio_access access;
-       void *location_private;
-       void *pri_type_private;
-       void *sec_type_private;
-} fileio_t;
-
-typedef struct fileio_text_s
-{
-} fileio_text_t;
-
-typedef struct fileio_image_s
-{
-       u32 base_address;
-       int has_start_address;
-       u32 start_address;
-} fileio_image_t;
-
-typedef struct fileio_local_s
-{
        FILE *file;
-       struct stat file_stat;
-} fileio_local_t;
-
-typedef struct fileio_ihex_s
-{
-       u32 position;
-       u32 raw_size;
-#ifdef FILEIO_BUFFER_COMPLETE_IHEX
-       u8 *buffer;
-#endif
-} fileio_ihex_t;
+} fileio_t;
 
-extern int fileio_identify_image_type(enum fileio_sec_type *sec_type, char *type_string);
-extern int fileio_write(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_written);
+extern int fileio_write(fileio_t *fileio, u32 size, const 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, 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_pri_type pri_type, void *pri_info, enum fileio_sec_type sec_type);
-       
+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, 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)