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 94ec70d1bcc89544b233d297d29a591d4a1147b1..855cb215e7dfffdd1b499cf181d1c18808131942 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -26,16 +26,11 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "fileio.h"
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
 #endif
-#include "replacements.h"
-#include "fileio.h"
-#include "target.h"
 
 #define IMAGE_MAX_ERROR_STRING         (256)
 #define IMAGE_MAX_SECTIONS                     (128)
@@ -44,12 +39,12 @@
 
 typedef enum image_type
 {
-    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_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
@@ -85,7 +80,7 @@ typedef struct image_ihex_s
 
 typedef struct image_memory_s
 {
-       target_t *target;
+       struct target_s *target;
        u8 *cache;
        u32 cache_address;
 } image_memory_t;
@@ -107,7 +102,7 @@ typedef struct image_mot_s
 
 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 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);