Audit and eliminate redundant #include directives in other target files.

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

diff --git a/src/target/image.h b/src/target/image.h
index 3df175a8d6c3ccd07737bee065b15a5fb08ce0ec..855cb215e7dfffdd1b499cf181d1c18808131942 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.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     *
@@ -21,32 +27,44 @@
 #define IMAGE_H
 
 #include "fileio.h"
-#include "target.h"
 
-#define IMAGE_MAX_ERROR_STRING         (128)
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#endif
+
+#define IMAGE_MAX_ERROR_STRING         (256)
+#define IMAGE_MAX_SECTIONS                     (128)
+
+#define IMAGE_MEMORY_CACHE_SIZE                (2048)
 
 typedef enum image_type
 {
-    IMAGE_BINARY,      /* plain binary */
-    IMAGE_IHEX,        /* intel hex-record format */
-    IMAGE_MEMORY,      /* target-memory pseudo-image */
-/*
- * Possible future enhancements:
- * IMAGE_ELF,
- * IMAGE_SRECORD,
- */
+       IMAGE_BINARY,   /* plain binary */
+       IMAGE_IHEX,             /* intel hex-record format */
+       IMAGE_MEMORY,   /* target-memory pseudo-image */
+       IMAGE_ELF,              /* ELF binary */
+       IMAGE_SRECORD,  /* motorola s19 */
+       IMAGE_BUILDER,  /* when building a new image */
 } image_type_t;
 
+typedef struct image_section_s
+{
+       u32 base_address;
+       u32 size;
+       int flags;
+       void *private;          /* private data */
+} image_section_t;
+
 typedef struct image_s
 {
        image_type_t type;              /* image type (plain, ihex, ...) */
        void *type_private;             /* type private data */
-       int base_address_set;   /* whether the image start address has been set */
-       u32 base_address;               /* base address of image in target memory */
+       int num_sections;               /* number of sections contained in the image */
+       image_section_t *sections;      /* array of sections */
+       int base_address_set;   /* whether the image has a base address set (for relocation purposes) */
+       int base_address;               /* base address, if one is set */
        int start_address_set;  /* whether the image has a start address (entry point) associated */
        u32 start_address;              /* start address, if one is set */
-       u32 size;                               /* image size in byte */
-       char error_str[IMAGE_MAX_ERROR_STRING];
 } image_t;
 
 typedef struct image_binary_s
@@ -57,23 +75,41 @@ typedef struct image_binary_s
 typedef struct image_ihex_s
 {
        fileio_t fileio;
-       u32 position;
-       u32 raw_size;
        u8 *buffer;
 } image_ihex_t;
 
 typedef struct image_memory_s
 {
-       target_t *target;
+       struct target_s *target;
+       u8 *cache;
+       u32 cache_address;
 } image_memory_t;
 
-extern int image_open(image_t *image, void *source, enum fileio_access access);
-extern int image_read(image_t *image, u32 size, u8 *buffer, u32 *size_written);
-extern int image_write(image_t *image, u32 size, u8 *buffer, u32 *size_written);
-extern int image_close(image_t *image);
-extern int identify_image_type(image_type_t *type, char *type_string);
+typedef struct fileio_elf_s
+{
+       fileio_t fileio;
+       Elf32_Ehdr *header;
+       Elf32_Phdr *segments;
+       u32 segment_count;
+       u8 endianness;
+} image_elf_t;
+
+typedef struct image_mot_s
+{
+       fileio_t fileio;
+       u8 *buffer;
+} image_mot_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 void image_close(image_t *image);
+extern int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data);
+
+extern int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum);
 
 #define ERROR_IMAGE_FORMAT_ERROR       (-1400)
 #define ERROR_IMAGE_TYPE_UNKNOWN       (-1401)
+#define ERROR_IMAGE_TEMPORARILY_UNAVAILABLE            (-1402)
+#define ERROR_IMAGE_CHECKSUM           (-1403)
 
 #endif /* IMAGE_H */