zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image: fix spelling mistake 

struct imageection => struct imagesection

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
__archive__
Øyvind Harboe 2010-09-27 16:29:08 +02:00
parent 3bb4a6ba14
commit 19167a7af6
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/flash/nor/core.c
View File

@ -522,9 +522,9 @@ int flash_unlock_address_range(struct target *target, uint32_t addr, uint32_t le
static int compare_section (const void * a, const void * b) static int compare_section (const void * a, const void * b)
{ {
struct imageection *b1, *b2; struct imagesection *b1, *b2;
b1=*((struct imageection **)a); b1=*((struct imagesection **)a);
b2=*((struct imageection **)b); b2=*((struct imagesection **)b);
if (b1->base_address == b2->base_address) if (b1->base_address == b2->base_address)
{ {
@ -568,7 +568,7 @@ int flash_write_unlock(struct target *target, struct image *image,
/* This fn requires all sections to be in ascending order of addresses, /* This fn requires all sections to be in ascending order of addresses,
* whereas an image can have sections out of order. */ * whereas an image can have sections out of order. */
struct imageection **sections = malloc(sizeof(struct imageection *) * struct imagesection **sections = malloc(sizeof(struct imagesection *) *
image->num_sections); image->num_sections);
int i; int i;
for (i = 0; i < image->num_sections; i++) for (i = 0; i < image->num_sections; i++)
@ -576,7 +576,7 @@ int flash_write_unlock(struct target *target, struct image *image,
sections[i] = &image->sections[i]; sections[i] = &image->sections[i];
} }
qsort(sections, image->num_sections, sizeof(struct imageection *), qsort(sections, image->num_sections, sizeof(struct imagesection *),
compare_section); compare_section);
/* loop until we reach end of the image */ /* loop until we reach end of the image */
@ -696,7 +696,7 @@ int flash_write_unlock(struct target *target, struct image *image,
* list of pointers to sections to invoke image_read_section()... * list of pointers to sections to invoke image_read_section()...
*/ */
intptr_t diff = (intptr_t)sections[section] - (intptr_t)image->sections; intptr_t diff = (intptr_t)sections[section] - (intptr_t)image->sections;
int t_section_num = diff / sizeof(struct imageection); int t_section_num = diff / sizeof(struct imagesection);
LOG_DEBUG("image_read_section: section = %d, t_section_num = %d, section_offset = %d, buffer_size = %d, size_read = %d", LOG_DEBUG("image_read_section: section = %d, t_section_num = %d, section_offset = %d, buffer_size = %d, size_read = %d",
(int)section, (int)section,

22
src/target/image.c
View File

@ -147,7 +147,7 @@ static int identify_image_type(struct image *image, const char *type_string, con
return ERROR_OK; return ERROR_OK;
} }
static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine, struct imageection *section) static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine, struct imagesection *section)
{ {
struct image_ihex *ihex = image->type_private; struct image_ihex *ihex = image->type_private;
struct fileio *fileio = &ihex->fileio; struct fileio *fileio = &ihex->fileio;
@ -230,7 +230,7 @@ static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine,
image->num_sections++; image->num_sections++;
/* copy section information */ /* copy section information */
image->sections = malloc(sizeof(struct imageection) * image->num_sections); image->sections = malloc(sizeof(struct imagesection) * image->num_sections);
for (i = 0; i < image->num_sections; i++) for (i = 0; i < image->num_sections; i++)
{ {
image->sections[i].private = section[i].private; image->sections[i].private = section[i].private;
@ -367,7 +367,7 @@ static int image_ihex_buffer_complete(struct image *image)
LOG_ERROR("Out of memory"); LOG_ERROR("Out of memory");
return ERROR_FAIL; return ERROR_FAIL;
} }
struct imageection *section = malloc(sizeof(struct imageection) * IMAGE_MAX_SECTIONS); struct imagesection *section = malloc(sizeof(struct imagesection) * IMAGE_MAX_SECTIONS);
if (section == NULL) if (section == NULL)
{ {
free(lpszLine); free(lpszLine);
@ -466,7 +466,7 @@ static int image_elf_read_headers(struct image *image)
if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
image->num_sections++; image->num_sections++;
/* alloc and fill sections array with loadable segments */ /* alloc and fill sections array with loadable segments */
image->sections = malloc(image->num_sections * sizeof(struct imageection)); image->sections = malloc(image->num_sections * sizeof(struct imagesection));
for (i = 0,j = 0;i < elf->segment_count;i++) 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)) if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
@ -526,7 +526,7 @@ static int image_elf_read_section(struct image *image, int section, uint32_t off
return ERROR_OK; return ERROR_OK;
} }
static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine, struct imageection *section) static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine, struct imagesection *section)
{ {
struct image_mot *mot = image->type_private; struct image_mot *mot = image->type_private;
struct fileio *fileio = &mot->fileio; struct fileio *fileio = &mot->fileio;
@ -660,7 +660,7 @@ static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine,
image->num_sections++; image->num_sections++;
/* copy section information */ /* copy section information */
image->sections = malloc(sizeof(struct imageection) * image->num_sections); image->sections = malloc(sizeof(struct imagesection) * image->num_sections);
for (i = 0; i < image->num_sections; i++) for (i = 0; i < image->num_sections; i++)
{ {
image->sections[i].private = section[i].private; image->sections[i].private = section[i].private;
@ -706,7 +706,7 @@ static int image_mot_buffer_complete(struct image *image)
LOG_ERROR("Out of memory"); LOG_ERROR("Out of memory");
return ERROR_FAIL; return ERROR_FAIL;
} }
struct imageection *section = malloc(sizeof(struct imageection) * IMAGE_MAX_SECTIONS); struct imagesection *section = malloc(sizeof(struct imagesection) * IMAGE_MAX_SECTIONS);
if (section == NULL) if (section == NULL)
{ {
free(lpszLine); free(lpszLine);
@ -745,7 +745,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
} }
image->num_sections = 1; image->num_sections = 1;
image->sections = malloc(sizeof(struct imageection)); image->sections = malloc(sizeof(struct imagesection));
image->sections[0].base_address = 0x0; image->sections[0].base_address = 0x0;
image->sections[0].size = image_binary->fileio.size; image->sections[0].size = image_binary->fileio.size;
image->sections[0].flags = 0; image->sections[0].flags = 0;
@ -798,7 +798,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
struct image_memory *image_memory; struct image_memory *image_memory;
image->num_sections = 1; image->num_sections = 1;
image->sections = malloc(sizeof(struct imageection)); image->sections = malloc(sizeof(struct imagesection));
image->sections[0].base_address = 0x0; image->sections[0].base_address = 0x0;
image->sections[0].size = 0xffffffff; image->sections[0].size = 0xffffffff;
image->sections[0].flags = 0; image->sections[0].flags = 0;
@ -954,7 +954,7 @@ int image_read_section(struct image *image, int section, uint32_t offset, uint32
int image_add_section(struct image *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)
{ {
struct imageection *section; struct imagesection *section;
/* only image builder supports adding sections */ /* only image builder supports adding sections */
if (image->type != IMAGE_BUILDER) if (image->type != IMAGE_BUILDER)
@ -978,7 +978,7 @@ int image_add_section(struct image *image, uint32_t base, uint32_t size, int fla
/* allocate new section */ /* allocate new section */
image->num_sections++; image->num_sections++;
image->sections = realloc(image->sections, sizeof(struct imageection) * image->num_sections); image->sections = realloc(image->sections, sizeof(struct imagesection) * image->num_sections);
section = &image->sections[image->num_sections - 1]; section = &image->sections[image->num_sections - 1];
section->base_address = base; section->base_address = base;
section->size = size; section->size = size;

4
src/target/image.h
View File

@ -47,7 +47,7 @@ enum image_type
IMAGE_BUILDER, /* when building a new image */ IMAGE_BUILDER, /* when building a new image */
}; };
struct imageection struct imagesection
{ {
uint32_t base_address; uint32_t base_address;
uint32_t size; uint32_t size;
@ -60,7 +60,7 @@ struct image
enum image_type type; /* image type (plain, ihex, ...) */ enum image_type type; /* image type (plain, ihex, ...) */
void *type_private; /* type private data */ void *type_private; /* type private data */
int num_sections; /* number of sections contained in the image */ 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_set; /* whether the image has a base address set (for relocation purposes) */
long long 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 */ int start_address_set; /* whether the image has a start address (entry point) associated */