- added mingw elf patches from Vincent Palatin

[fw/openocd] / src / target / image.h

diff --git a/src/target/image.h b/src/target/image.h
index 75288791a6394a6a2b8f5820c776a669cf86c824..07931472ec525a7e990ec4aa51fcecf4921fe605 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -20,20 +20,30 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#endif
+#include "replacements.h"
 #include "fileio.h"
 #include "target.h"
 
-#define IMAGE_MAX_ERROR_STRING         (128)
+#define IMAGE_MAX_ERROR_STRING         (256)
 #define IMAGE_MAX_SECTIONS                     (128)
 
+#define IMAGE_MEMORY_CACHE_SIZE                (128)
+
 typedef enum image_type
 {
     IMAGE_BINARY,      /* plain binary */
     IMAGE_IHEX,                /* intel hex-record format */
     IMAGE_MEMORY,      /* target-memory pseudo-image */
+    IMAGE_ELF,         /* ELF binary */
 /*
  * Possible future enhancements:
- * IMAGE_ELF,
  * IMAGE_SRECORD,
  */
 } image_type_t;
@@ -43,6 +53,7 @@ typedef struct image_section_s
        u32 base_address;
        u32 size;
        int flags;
+       void *private;          /* private data */
 } image_section_t;
 
 typedef struct image_s
@@ -67,20 +78,30 @@ typedef struct image_ihex_s
 {
        fileio_t fileio;
        u8 *buffer;
-       u8 **section_pointer;
 } image_ihex_t;
 
 typedef struct image_memory_s
 {
        target_t *target;
+       u8 *cache;
+       u32 cache_address;
 } image_memory_t;
 
-extern int image_open(image_t *image, void *source, enum fileio_access access);
+typedef struct fileio_elf_s
+{
+       fileio_t fileio;
+       Elf32_Ehdr *header;
+       Elf32_Phdr *segments;
+       u32 segment_count;
+       u8 endianness;
+} image_elf_t;
+
+extern int image_open(image_t *image, char *url, char *type_string);
 extern int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read);
 extern int image_close(image_t *image);
-extern int identify_image_type(image_type_t *type, char *type_string);
 
 #define ERROR_IMAGE_FORMAT_ERROR       (-1400)
 #define ERROR_IMAGE_TYPE_UNKNOWN       (-1401)
+#define ERROR_IMAGE_TEMPORARILY_UNAVAILABLE            (-1402)
 
 #endif /* IMAGE_H */