dsp5680xx - mark erase after unlocking flash

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

diff --git a/src/target/image.h b/src/target/image.h
index 06d47bf874612bdd8e99d8a74ff7e266a8968ecd..27f31869a80006a8f22d44e9e9006b1de8bdc61f 100644 (file)
--- 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>
@@ -47,7 +47,7 @@ enum image_type
        IMAGE_BUILDER,  /* when building a new image */
 };
 
-struct imageection
+struct imagesection
 {
        uint32_t base_address;
        uint32_t size;
@@ -60,9 +60,9 @@ struct image
        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 imageection *sections;   /* array of sections */
+       struct imagesection *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 */
 };
@@ -102,7 +102,7 @@ struct image_mot
 
 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, uint32_t *size_read);
+               uint32_t size, uint8_t *buffer, size_t *size_read);
 void image_close(struct image *image);
 
 int image_add_section(struct image *image, uint32_t base, uint32_t size,