auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

helper/fileio: Remove nested struct

Browse Source 
Change-Id: I1a3afbddcf950689da58e0df8850a05f558d7879
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3222
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Marc Schink
2015-10-04 17:18:40 +02:00
committed by Andreas Fritiofson
parent 7c957b601f
commit 73b676c2fd
14 changed files with 171 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/target/etm.c
View File

@@ -1701,7 +1701,7 @@ COMMAND_HANDLER(handle_etm_image_command)
COMMAND_HANDLER(handle_etm_dump_command)
{
struct fileio file;
struct fileio *file;
struct target *target;
struct arm *arm;
struct etm_context *etm_ctx;
@@ -1741,24 +1741,24 @@ COMMAND_HANDLER(handle_etm_dump_command)
if (fileio_open(&file, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
return ERROR_FAIL;
fileio_write_u32(&file, etm_ctx->capture_status);
fileio_write_u32(&file, etm_ctx->control);
fileio_write_u32(&file, etm_ctx->trace_depth);
fileio_write_u32(file, etm_ctx->capture_status);
fileio_write_u32(file, etm_ctx->control);
fileio_write_u32(file, etm_ctx->trace_depth);
for (i = 0; i < etm_ctx->trace_depth; i++) {
fileio_write_u32(&file, etm_ctx->trace_data[i].pipestat);
fileio_write_u32(&file, etm_ctx->trace_data[i].packet);
fileio_write_u32(&file, etm_ctx->trace_data[i].flags);
fileio_write_u32(file, etm_ctx->trace_data[i].pipestat);
fileio_write_u32(file, etm_ctx->trace_data[i].packet);
fileio_write_u32(file, etm_ctx->trace_data[i].flags);
}
fileio_close(&file);
fileio_close(file);
return ERROR_OK;
}
COMMAND_HANDLER(handle_etm_load_command)
{
struct fileio file;
struct fileio *file;
struct target *target;
struct arm *arm;
struct etm_context *etm_ctx;
@@ -1789,15 +1789,15 @@ COMMAND_HANDLER(handle_etm_load_command)
return ERROR_FAIL;
size_t filesize;
int retval = fileio_size(&file, &filesize);
int retval = fileio_size(file, &filesize);
if (retval != ERROR_OK) {
fileio_close(&file);
fileio_close(file);
return retval;
}
if (filesize % 4) {
command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
fileio_close(&file);
fileio_close(file);
return ERROR_FAIL;
}
@@ -1808,28 +1808,28 @@ COMMAND_HANDLER(handle_etm_load_command)
{
uint32_t tmp;
fileio_read_u32(&file, &tmp); etm_ctx->capture_status = tmp;
fileio_read_u32(&file, &tmp); etm_ctx->control = tmp;
fileio_read_u32(&file, &etm_ctx->trace_depth);
fileio_read_u32(file, &tmp); etm_ctx->capture_status = tmp;
fileio_read_u32(file, &tmp); etm_ctx->control = tmp;
fileio_read_u32(file, &etm_ctx->trace_depth);
}
etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
if (etm_ctx->trace_data == NULL) {
command_print(CMD_CTX, "not enough memory to perform operation");
fileio_close(&file);
fileio_close(file);
return ERROR_FAIL;
}
for (i = 0; i < etm_ctx->trace_depth; i++) {
uint32_t pipestat, packet, flags;
fileio_read_u32(&file, &pipestat);
fileio_read_u32(&file, &packet);
fileio_read_u32(&file, &flags);
fileio_read_u32(file, &pipestat);
fileio_read_u32(file, &packet);
fileio_read_u32(file, &flags);
etm_ctx->trace_data[i].pipestat = pipestat & 0xff;
etm_ctx->trace_data[i].packet = packet & 0xffff;
etm_ctx->trace_data[i].flags = flags;
}
fileio_close(&file);
fileio_close(file);
return ERROR_OK;
}

42
src/target/image.c
View File

@@ -47,7 +47,7 @@
static int autodetect_image_type(struct image *image, const char *url)
{
int retval;
struct fileio fileio;
struct fileio *fileio;
size_t read_bytes;
uint8_t buffer[9];
@@ -55,13 +55,13 @@ static int autodetect_image_type(struct image *image, const char *url)
retval = fileio_open(&fileio, url, FILEIO_READ, FILEIO_BINARY);
if (retval != ERROR_OK)
return retval;
retval = fileio_read(&fileio, 9, buffer, &read_bytes);
retval = fileio_read(fileio, 9, buffer, &read_bytes);
if (retval == ERROR_OK) {
if (read_bytes != 9)
retval = ERROR_FILEIO_OPERATION_FAILED;
}
fileio_close(&fileio);
fileio_close(fileio);
if (retval != ERROR_OK)
return retval;
@@ -122,7 +122,7 @@ static int image_ihex_buffer_complete_inner(struct image *image,
struct imagesection *section)
{
struct image_ihex *ihex = image->type_private;
struct fileio *fileio = &ihex->fileio;
struct fileio *fileio = ihex->fileio;
uint32_t full_address = 0x0;
uint32_t cooked_bytes;
int i;
@@ -352,7 +352,7 @@ static int image_elf_read_headers(struct image *image)
return ERROR_FILEIO_OPERATION_FAILED;
}
retval = fileio_read(&elf->fileio, sizeof(Elf32_Ehdr), (uint8_t *)elf->header, &read_bytes);
retval = fileio_read(elf->fileio, sizeof(Elf32_Ehdr), (uint8_t *)elf->header, &read_bytes);
if (retval != ERROR_OK) {
LOG_ERROR("cannot read ELF file header, read failed");
return ERROR_FILEIO_OPERATION_FAILED;
@@ -384,7 +384,7 @@ static int image_elf_read_headers(struct image *image)
return ERROR_IMAGE_FORMAT_ERROR;
}
retval = fileio_seek(&elf->fileio, field32(elf, elf->header->e_phoff));
retval = fileio_seek(elf->fileio, field32(elf, elf->header->e_phoff));
if (retval != ERROR_OK) {
LOG_ERROR("cannot seek to ELF program header table, read failed");
return retval;
@@ -396,7 +396,7 @@ static int image_elf_read_headers(struct image *image)
return ERROR_FILEIO_OPERATION_FAILED;
}
retval = fileio_read(&elf->fileio, elf->segment_count*sizeof(Elf32_Phdr),
retval = fileio_read(elf->fileio, elf->segment_count*sizeof(Elf32_Phdr),
(uint8_t *)elf->segments, &read_bytes);
if (retval != ERROR_OK) {
LOG_ERROR("cannot read ELF segment headers, read failed");
@@ -486,12 +486,12 @@ static int image_elf_read_section(struct image *image,
LOG_DEBUG("read elf: size = 0x%zu at 0x%" PRIx32 "", read_size,
field32(elf, segment->p_offset) + offset);
/* read initialized area of the segment */
retval = fileio_seek(&elf->fileio, field32(elf, segment->p_offset) + offset);
retval = fileio_seek(elf->fileio, field32(elf, segment->p_offset) + offset);
if (retval != ERROR_OK) {
LOG_ERROR("cannot find ELF segment content, seek failed");
return retval;
}
retval = fileio_read(&elf->fileio, read_size, buffer, &really_read);
retval = fileio_read(elf->fileio, read_size, buffer, &really_read);
if (retval != ERROR_OK) {
LOG_ERROR("cannot read ELF segment content, read failed");
return retval;
@@ -511,7 +511,7 @@ static int image_mot_buffer_complete_inner(struct image *image,
struct imagesection *section)
{
struct image_mot *mot = image->type_private;
struct fileio *fileio = &mot->fileio;
struct fileio *fileio = mot->fileio;
uint32_t full_address = 0x0;
uint32_t cooked_bytes;
int i;
@@ -708,9 +708,9 @@ int image_open(struct image *image, const char *url, const char *type_string)
if (retval != ERROR_OK)
return retval;
size_t filesize;
retval = fileio_size(&image_binary->fileio, &filesize);
retval = fileio_size(image_binary->fileio, &filesize);
if (retval != ERROR_OK) {
fileio_close(&image_binary->fileio);
fileio_close(image_binary->fileio);
return retval;
}
@@ -732,7 +732,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
if (retval != ERROR_OK) {
LOG_ERROR(
"failed buffering IHEX image, check daemon output for additional information");
fileio_close(&image_ihex->fileio);
fileio_close(image_ihex->fileio);
return retval;
}
} else if (image->type == IMAGE_ELF) {
@@ -746,7 +746,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
retval = image_elf_read_headers(image);
if (retval != ERROR_OK) {
fileio_close(&image_elf->fileio);
fileio_close(image_elf->fileio);
return retval;
}
} else if (image->type == IMAGE_MEMORY) {
@@ -783,7 +783,7 @@ int image_open(struct image *image, const char *url, const char *type_string)
if (retval != ERROR_OK) {
LOG_ERROR(
"failed buffering S19 image, check daemon output for additional information");
fileio_close(&image_mot->fileio);
fileio_close(image_mot->fileio);
return retval;
}
} else if (image->type == IMAGE_BUILDER) {
@@ -835,12 +835,12 @@ int image_read_section(struct image *image,
return ERROR_COMMAND_SYNTAX_ERROR;
/* seek to offset */
retval = fileio_seek(&image_binary->fileio, offset);
retval = fileio_seek(image_binary->fileio, offset);
if (retval != ERROR_OK)
return retval;
/* return requested bytes */
retval = fileio_read(&image_binary->fileio, size, buffer, size_read);
retval = fileio_read(image_binary->fileio, size, buffer, size_read);
if (retval != ERROR_OK)
return retval;
} else if (image->type == IMAGE_IHEX) {
@@ -945,11 +945,11 @@ void image_close(struct image *image)
if (image->type == IMAGE_BINARY) {
struct image_binary *image_binary = image->type_private;
fileio_close(&image_binary->fileio);
fileio_close(image_binary->fileio);
} else if (image->type == IMAGE_IHEX) {
struct image_ihex *image_ihex = image->type_private;
fileio_close(&image_ihex->fileio);
fileio_close(image_ihex->fileio);
if (image_ihex->buffer) {
free(image_ihex->buffer);
@@ -958,7 +958,7 @@ void image_close(struct image *image)
} else if (image->type == IMAGE_ELF) {
struct image_elf *image_elf = image->type_private;
fileio_close(&image_elf->fileio);
fileio_close(image_elf->fileio);
if (image_elf->header) {
free(image_elf->header);
@@ -979,7 +979,7 @@ void image_close(struct image *image)
} else if (image->type == IMAGE_SRECORD) {
struct image_mot *image_mot = image->type_private;
fileio_close(&image_mot->fileio);
fileio_close(image_mot->fileio);
if (image_mot->buffer) {
free(image_mot->buffer);

8
src/target/image.h
View File

@@ -66,11 +66,11 @@ struct image {
};
struct image_binary {
struct fileio fileio;
struct fileio *fileio;
};
struct image_ihex {
struct fileio fileio;
struct fileio *fileio;
uint8_t *buffer;
};
@@ -81,7 +81,7 @@ struct image_memory {
};
struct image_elf {
struct fileio fileio;
struct fileio *fileio;
Elf32_Ehdr *header;
Elf32_Phdr *segments;
uint32_t segment_count;
@@ -89,7 +89,7 @@ struct image_elf {
};
struct image_mot {
struct fileio fileio;
struct fileio *fileio;
uint8_t *buffer;
};

8
src/target/target.c
View File

@@ -3221,7 +3221,7 @@ COMMAND_HANDLER(handle_load_image_command)
COMMAND_HANDLER(handle_dump_image_command)
{
struct fileio fileio;
struct fileio *fileio;
uint8_t *buffer;
int retval, retvaltemp;
uint32_t address, size;
@@ -3254,7 +3254,7 @@ COMMAND_HANDLER(handle_dump_image_command)
if (retval != ERROR_OK)
break;
retval = fileio_write(&fileio, this_run_size, buffer, &size_written);
retval = fileio_write(fileio, this_run_size, buffer, &size_written);
if (retval != ERROR_OK)
break;
@@ -3266,7 +3266,7 @@ COMMAND_HANDLER(handle_dump_image_command)
if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK)) {
size_t filesize;
retval = fileio_size(&fileio, &filesize);
retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK)
return retval;
command_print(CMD_CTX,
@@ -3274,7 +3274,7 @@ COMMAND_HANDLER(handle_dump_image_command)
duration_elapsed(&bench), duration_kbps(&bench, filesize));
}
retvaltemp = fileio_close(&fileio);
retvaltemp = fileio_close(fileio);
if (retvaltemp != ERROR_OK)
return retvaltemp;

14
src/target/xscale.c
View File

@@ -3425,7 +3425,7 @@ COMMAND_HANDLER(xscale_handle_dump_trace_command)
struct target *target = get_current_target(CMD_CTX);
struct xscale_common *xscale = target_to_xscale(target);
struct xscale_trace_data *trace_data;
struct fileio file;
struct fileio *file;
int retval;
retval = xscale_verify_pointer(CMD_CTX, xscale);
@@ -3453,19 +3453,19 @@ COMMAND_HANDLER(xscale_handle_dump_trace_command)
while (trace_data) {
int i;
fileio_write_u32(&file, trace_data->chkpt0);
fileio_write_u32(&file, trace_data->chkpt1);
fileio_write_u32(&file, trace_data->last_instruction);
fileio_write_u32(&file, trace_data->depth);
fileio_write_u32(file, trace_data->chkpt0);
fileio_write_u32(file, trace_data->chkpt1);
fileio_write_u32(file, trace_data->last_instruction);
fileio_write_u32(file, trace_data->depth);
for (i = 0; i < trace_data->depth; i++)
fileio_write_u32(&file, trace_data->entries[i].data |
fileio_write_u32(file, trace_data->entries[i].data |
((trace_data->entries[i].type & 0xffff) << 16));
trace_data = trace_data->next;
}
fileio_close(&file);
fileio_close(file);
return ERROR_OK;
}