flash_sector_t -> struct flash_sector

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

diff --git a/src/target/image.h b/src/target/image.h
index 551524e306292aaafba5a0e7a97fec6d988c2e1e..a1e24c44c4be081e2f12e8f8fc4cad0c70b6d925 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -69,12 +69,12 @@ typedef struct image_s
 
 typedef struct image_binary_s
 {
-       fileio_t fileio;
+       struct fileio fileio;
 } image_binary_t;
 
 typedef struct image_ihex_s
 {
-       fileio_t fileio;
+       struct fileio fileio;
        uint8_t *buffer;
 } image_ihex_t;
 
@@ -87,7 +87,7 @@ typedef struct image_memory_s
 
 typedef struct fileio_elf_s
 {
-       fileio_t fileio;
+       struct fileio fileio;
        Elf32_Ehdr *header;
        Elf32_Phdr *segments;
        uint32_t segment_count;
@@ -96,16 +96,20 @@ typedef struct fileio_elf_s
 
 typedef struct image_mot_s
 {
-       fileio_t fileio;
+       struct fileio fileio;
        uint8_t *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, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read);
-extern void image_close(image_t *image);
-extern int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data);
+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);
 
-extern int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes, uint32_t* checksum);
+int image_add_section(image_t *image, uint32_t base, uint32_t size,
+               int flags, uint8_t *data);
+
+int image_calculate_checksum(uint8_t* buffer, uint32_t nbytes,
+               uint32_t* checksum);
 
 #define ERROR_IMAGE_FORMAT_ERROR       (-1400)
 #define ERROR_IMAGE_TYPE_UNKNOWN       (-1401)