X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fimage.h;h=b096031b02017ba10e0a9b7928ccb2374f129437;hb=f0c0256b1f05a04a58d857e9d865a0be0dd1680d;hp=5969ddebaa09242f775cf34e76fc76d91ea10511;hpb=b154972bdbcbda1ae8e05271c0db556fade8dbef;p=openocd.git

diff --git a/src/target/image.h b/src/target/image.h
index 5969ddebaa..b096031b02 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -26,7 +26,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "fileio.h"
+#include <helper/fileio.h>
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
@@ -37,7 +37,7 @@
 
 #define IMAGE_MEMORY_CACHE_SIZE		(2048)
 
-typedef enum image_type
+enum image_type
 {
 	IMAGE_BINARY,	/* plain binary */
 	IMAGE_IHEX,		/* intel hex-record format */
@@ -45,9 +45,9 @@ typedef enum image_type
 	IMAGE_ELF,		/* ELF binary */
 	IMAGE_SRECORD,	/* motorola s19 */
 	IMAGE_BUILDER,	/* when building a new image */
-} image_type_t;
+};
 
-struct image_section
+struct imageection
 {
 	uint32_t base_address;
 	uint32_t size;
@@ -55,17 +55,17 @@ struct image_section
 	void *private;		/* private data */
 };
 
-typedef struct image_s
+struct image
 {
-	image_type_t type;		/* image type (plain, ihex, ...) */
+	enum image_type type;		/* image type (plain, ihex, ...) */
 	void *type_private;		/* type private data */
 	int num_sections;		/* number of sections contained in the image */
-	struct image_section *sections;	/* array of sections */
+	struct imageection *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 */
+	long long base_address;		/* base address, if one is set */
 	int start_address_set;	/* whether the image has a start address (entry point) associated */
 	uint32_t start_address;		/* start address, if one is set */
-} image_t;
+};
 
 struct image_binary
 {
@@ -80,32 +80,32 @@ struct image_ihex
 
 struct image_memory
 {
-	struct target_s *target;
+	struct target *target;
 	uint8_t *cache;
 	uint32_t cache_address;
 };
 
-typedef struct fileio_elf_s
+struct image_elf
 {
 	struct fileio fileio;
 	Elf32_Ehdr *header;
 	Elf32_Phdr *segments;
 	uint32_t segment_count;
 	uint8_t endianness;
-} image_elf_t;
+};
 
-typedef struct image_mot_s
+struct image_mot
 {
 	struct fileio fileio;
 	uint8_t *buffer;
-} image_mot_t;
+};
 
-int image_open(image_t *image, const char *url, const char *type_string);
-int image_read_section(image_t *image, int section, uint32_t offset,
-		uint32_t size, uint8_t *buffer, uint32_t *size_read);
-void image_close(image_t *image);
+int image_open(struct image *image, const char *url, const char *type_string);
+int image_read_section(struct image *image, int section, uint32_t offset,
+		uint32_t size, uint8_t *buffer, size_t *size_read);
+void image_close(struct image *image);
 
-int image_add_section(image_t *image, uint32_t base, uint32_t size,
+int image_add_section(struct image *image, uint32_t base, uint32_t size,
 		int flags, uint8_t *data);
 
 int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes,