image_mot_t -> struct image_mot

[openocd.git] / src / target / image.c

diff --git a/src/target/image.c b/src/target/image.c
index 9a9c9553b87f1b66bdb71da7ebf684fb1bdb8a4f..608ac59d4586ac7b0973584611f4ac3450027908 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -149,7 +149,7 @@ static int identify_image_type(image_t *image, const char *type_string, const ch
 
 static int image_ihex_buffer_complete(image_t *image)
 {
-       image_ihex_t *ihex = image->type_private;
+       struct image_ihex *ihex = image->type_private;
        struct fileio *fileio = &ihex->fileio;
        uint32_t full_address = 0x0;
        uint32_t cooked_bytes;
@@ -158,7 +158,7 @@ static int image_ihex_buffer_complete(image_t *image)
 
        /* we can't determine the number of sections that we'll have to create ahead of time,
         * so we locally hold them until parsing is finished */
-       image_section_t section[IMAGE_MAX_SECTIONS];
+       struct image_section section[IMAGE_MAX_SECTIONS];
 
        ihex->buffer = malloc(fileio->size >> 1);
        cooked_bytes = 0x0;
@@ -232,7 +232,7 @@ static int image_ihex_buffer_complete(image_t *image)
                        image->num_sections++;
 
                        /* copy section information */
-                       image->sections = malloc(sizeof(image_section_t) * image->num_sections);
+                       image->sections = malloc(sizeof(struct image_section) * image->num_sections);
                        for (i = 0; i < image->num_sections; i++)
                        {
                                image->sections[i].private = section[i].private;
@@ -439,7 +439,7 @@ static int image_elf_read_headers(image_t *image)
                if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
                        image->num_sections++;
        /* alloc and fill sections array with loadable segments */
-       image->sections = malloc(image->num_sections * sizeof(image_section_t));
+       image->sections = malloc(image->num_sections * sizeof(struct image_section));
        for (i = 0,j = 0;i < elf->segment_count;i++)
        {
                if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
@@ -501,7 +501,7 @@ static int image_elf_read_section(image_t *image, int section, uint32_t offset,
 
 static int image_mot_buffer_complete(image_t *image)
 {
-       image_mot_t *mot = image->type_private;
+       struct image_mot *mot = image->type_private;
        struct fileio *fileio = &mot->fileio;
        uint32_t full_address = 0x0;
        uint32_t cooked_bytes;
@@ -510,7 +510,7 @@ static int image_mot_buffer_complete(image_t *image)
 
        /* we can't determine the number of sections that we'll have to create ahead of time,
         * so we locally hold them until parsing is finished */
-       image_section_t section[IMAGE_MAX_SECTIONS];
+       struct image_section section[IMAGE_MAX_SECTIONS];
 
        mot->buffer = malloc(fileio->size >> 1);
        cooked_bytes = 0x0;
@@ -635,7 +635,7 @@ static int image_mot_buffer_complete(image_t *image)
                        image->num_sections++;
 
                        /* copy section information */
-                       image->sections = malloc(sizeof(image_section_t) * image->num_sections);
+                       image->sections = malloc(sizeof(struct image_section) * image->num_sections);
                        for (i = 0; i < image->num_sections; i++)
                        {
                                image->sections[i].private = section[i].private;
@@ -680,9 +680,9 @@ int image_open(image_t *image, const char *url, const char *type_string)
 
        if (image->type == IMAGE_BINARY)
        {
-               image_binary_t *image_binary;
+               struct image_binary *image_binary;
 
-               image_binary = image->type_private = malloc(sizeof(image_binary_t));
+               image_binary = image->type_private = malloc(sizeof(struct image_binary));
 
                if ((retval = fileio_open(&image_binary->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
                {
@@ -690,16 +690,16 @@ int image_open(image_t *image, const char *url, const char *type_string)
                }
 
                image->num_sections = 1;
-               image->sections = malloc(sizeof(image_section_t));
+               image->sections = malloc(sizeof(struct image_section));
                image->sections[0].base_address = 0x0;
                image->sections[0].size = image_binary->fileio.size;
                image->sections[0].flags = 0;
        }
        else if (image->type == IMAGE_IHEX)
        {
-               image_ihex_t *image_ihex;
+               struct image_ihex *image_ihex;
 
-               image_ihex = image->type_private = malloc(sizeof(image_ihex_t));
+               image_ihex = image->type_private = malloc(sizeof(struct image_ihex));
 
                if ((retval = fileio_open(&image_ihex->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
                {
@@ -740,15 +740,15 @@ int image_open(image_t *image, const char *url, const char *type_string)
                        return ERROR_FAIL;
                }
 
-               image_memory_t *image_memory;
+               struct image_memory *image_memory;
 
                image->num_sections = 1;
-               image->sections = malloc(sizeof(image_section_t));
+               image->sections = malloc(sizeof(struct image_section));
                image->sections[0].base_address = 0x0;
                image->sections[0].size = 0xffffffff;
                image->sections[0].flags = 0;
 
-               image_memory = image->type_private = malloc(sizeof(image_memory_t));
+               image_memory = image->type_private = malloc(sizeof(struct image_memory));
 
                image_memory->target = target;
                image_memory->cache = NULL;
@@ -756,9 +756,9 @@ int image_open(image_t *image, const char *url, const char *type_string)
        }
        else if (image->type == IMAGE_SRECORD)
        {
-               image_mot_t *image_mot;
+               struct image_mot *image_mot;
 
-               image_mot = image->type_private = malloc(sizeof(image_mot_t));
+               image_mot = image->type_private = malloc(sizeof(struct image_mot));
 
                if ((retval = fileio_open(&image_mot->fileio, url, FILEIO_READ, FILEIO_TEXT)) != ERROR_OK)
                {
@@ -811,7 +811,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
 
        if (image->type == IMAGE_BINARY)
        {
-               image_binary_t *image_binary = image->type_private;
+               struct image_binary *image_binary = image->type_private;
 
                /* only one section in a plain binary */
                if (section != 0)
@@ -842,7 +842,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
        }
        else if (image->type == IMAGE_MEMORY)
        {
-               image_memory_t *image_memory = image->type_private;
+               struct image_memory *image_memory = image->type_private;
                uint32_t address = image->sections[section].base_address + offset;
 
                *size_read = 0;
@@ -899,7 +899,7 @@ int image_read_section(image_t *image, int section, uint32_t offset, uint32_t si
 
 int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data)
 {
-       image_section_t *section;
+       struct image_section *section;
 
        /* only image builder supports adding sections */
        if (image->type != IMAGE_BUILDER)
@@ -923,7 +923,7 @@ int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, u
 
        /* allocate new section */
        image->num_sections++;
-       image->sections = realloc(image->sections, sizeof(image_section_t) * image->num_sections);
+       image->sections = realloc(image->sections, sizeof(struct image_section) * image->num_sections);
        section = &image->sections[image->num_sections - 1];
        section->base_address = base;
        section->size = size;
@@ -938,13 +938,13 @@ void image_close(image_t *image)
 {
        if (image->type == IMAGE_BINARY)
        {
-               image_binary_t *image_binary = image->type_private;
+               struct image_binary *image_binary = image->type_private;
 
                fileio_close(&image_binary->fileio);
        }
        else if (image->type == IMAGE_IHEX)
        {
-               image_ihex_t *image_ihex = image->type_private;
+               struct image_ihex *image_ihex = image->type_private;
 
                fileio_close(&image_ihex->fileio);
 
@@ -974,7 +974,7 @@ void image_close(image_t *image)
        }
        else if (image->type == IMAGE_MEMORY)
        {
-               image_memory_t *image_memory = image->type_private;
+               struct image_memory *image_memory = image->type_private;
 
                if (image_memory->cache)
                {
@@ -984,7 +984,7 @@ void image_close(image_t *image)
        }
        else if (image->type == IMAGE_SRECORD)
        {
-               image_mot_t *image_mot = image->type_private;
+               struct image_mot *image_mot = image->type_private;
 
                fileio_close(&image_mot->fileio);