- split fileio handling into fileio part and image handling

- reworked etm/etb into a generic etm part with trace capture drivers (currently only etb supported)
- added XScale debug handler binary to repository
- added Thumb disassembling (thanks to Vincent Palatin for this patch)
- added support for non-CFI compatible flashes to cfi driver (currently only SST39VFxxx devices supported)
This checkin is experimental, not suitable for general use


git-svn-id: svn://svn.berlios.de/openocd/trunk@155 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 12 insertions, 45 deletions

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index c047cb8..55e6f32 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -22,28 +22,20 @@
 
 #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/types.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,
- */
+	FILEIO_TEXT,
+	FILEIO_BINARY,
 };
 
 enum fileio_location
@@ -73,48 +65,23 @@ 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_type type;
 	enum fileio_location location;
 	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;
-
-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_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_pri_type pri_type, void *pri_info, enum fileio_sec_type sec_type);
+extern int fileio_open(fileio_t *fileio, char *url, enum fileio_access access, enum fileio_type type);
 	
 #define ERROR_FILEIO_LOCATION_UNKNOWN	(-1200)
 #define ERROR_FILEIO_NOT_FOUND			(-1201)