((elf->endianness == ELFDATA2LSB)? \
le_to_h_u32((uint8_t*)&field):be_to_h_u32((uint8_t*)&field))
-static int autodetect_image_type(image_t *image, const char *url)
+static int autodetect_image_type(struct image *image, const char *url)
{
int retval;
struct fileio fileio;
return ERROR_OK;
}
-static int identify_image_type(image_t *image, const char *type_string, const char *url)
+static int identify_image_type(struct image *image, const char *type_string, const char *url)
{
if (type_string)
{
return ERROR_OK;
}
-static int image_ihex_buffer_complete(image_t *image)
+static int image_ihex_buffer_complete(struct image *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;
/* 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 imageection section[IMAGE_MAX_SECTIONS];
ihex->buffer = malloc(fileio->size >> 1);
cooked_bytes = 0x0;
image->num_sections++;
/* copy section information */
- image->sections = malloc(sizeof(image_section_t) * image->num_sections);
+ image->sections = malloc(sizeof(struct imageection) * image->num_sections);
for (i = 0; i < image->num_sections; i++)
{
image->sections[i].private = section[i].private;
return ERROR_IMAGE_FORMAT_ERROR;
}
-static int image_elf_read_headers(image_t *image)
+static int image_elf_read_headers(struct image *image)
{
- image_elf_t *elf = image->type_private;
+ struct image_elf *elf = image->type_private;
uint32_t read_bytes;
uint32_t i,j;
int retval;
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 imageection));
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))
return ERROR_OK;
}
-static int image_elf_read_section(image_t *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read)
+static int image_elf_read_section(struct image *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read)
{
- image_elf_t *elf = image->type_private;
+ struct image_elf *elf = image->type_private;
Elf32_Phdr *segment = (Elf32_Phdr *)image->sections[section].private;
uint32_t read_size,really_read;
int retval;
return ERROR_OK;
}
-static int image_mot_buffer_complete(image_t *image)
+static int image_mot_buffer_complete(struct image *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;
/* 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 imageection section[IMAGE_MAX_SECTIONS];
mot->buffer = malloc(fileio->size >> 1);
cooked_bytes = 0x0;
image->num_sections++;
/* copy section information */
- image->sections = malloc(sizeof(image_section_t) * image->num_sections);
+ image->sections = malloc(sizeof(struct imageection) * image->num_sections);
for (i = 0; i < image->num_sections; i++)
{
image->sections[i].private = section[i].private;
return ERROR_IMAGE_FORMAT_ERROR;
}
-int image_open(image_t *image, const char *url, const char *type_string)
+int image_open(struct image *image, const char *url, const char *type_string)
{
int retval = ERROR_OK;
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)
{
}
image->num_sections = 1;
- image->sections = malloc(sizeof(image_section_t));
+ image->sections = malloc(sizeof(struct imageection));
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)
{
}
else if (image->type == IMAGE_ELF)
{
- image_elf_t *image_elf;
+ struct image_elf *image_elf;
- image_elf = image->type_private = malloc(sizeof(image_elf_t));
+ image_elf = image->type_private = malloc(sizeof(struct image_elf));
if ((retval = fileio_open(&image_elf->fileio, url, FILEIO_READ, FILEIO_BINARY)) != ERROR_OK)
{
}
else if (image->type == IMAGE_MEMORY)
{
- target_t *target = get_target(url);
+ struct target *target = get_target(url);
if (target == NULL)
{
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 imageection));
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;
}
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)
{
return retval;
};
-int image_read_section(image_t *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read)
+int image_read_section(struct image *image, int section, uint32_t offset, uint32_t size, uint8_t *buffer, uint32_t *size_read)
{
int retval;
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)
}
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;
return ERROR_OK;
}
-int image_add_section(image_t *image, uint32_t base, uint32_t size, int flags, uint8_t *data)
+int image_add_section(struct image *image, uint32_t base, uint32_t size, int flags, uint8_t *data)
{
- image_section_t *section;
+ struct imageection *section;
/* only image builder supports adding sections */
if (image->type != IMAGE_BUILDER)
/* 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 imageection) * image->num_sections);
section = &image->sections[image->num_sections - 1];
section->base_address = base;
section->size = size;
return ERROR_OK;
}
-void image_close(image_t *image)
+void image_close(struct image *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);
}
else if (image->type == IMAGE_ELF)
{
- image_elf_t *image_elf = image->type_private;
+ struct image_elf *image_elf = image->type_private;
fileio_close(&image_elf->fileio);
}
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)
{
}
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);