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

fileio: refactor struct fileio to be an opaque structure

Browse Source 
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
Øyvind Harboe
2010-09-28 15:37:56 +02:00
parent ecad76061f
commit 3a693ef526
9 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/mflash.c
View File

@@ -726,8 +726,8 @@ COMMAND_HANDLER(mg_write_cmd)
return ERROR_FAIL;
}
cnt = fileio.size / MG_FILEIO_CHUNK;
res = fileio.size % MG_FILEIO_CHUNK;
cnt = fileio_size(&fileio) / MG_FILEIO_CHUNK;
res = fileio_size(&fileio) % MG_FILEIO_CHUNK;
struct duration bench;
duration_start(&bench);
@@ -752,8 +752,8 @@ COMMAND_HANDLER(mg_write_cmd)
if (duration_measure(&bench) == ERROR_OK)
{
command_print(CMD_CTX, "wrote %ld bytes from file %s "
"in %fs (%0.3f kB/s)", (long)fileio.size, CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
"in %fs (%0.3f kB/s)", (long)fileio_size(&fileio), CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
}
free(buffer);

2
src/flash/nand/fileio.c
View File

@@ -180,7 +180,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
return retval;
if (!need_size)
state->size = state->fileio.size;
state->size = fileio_size(&state->fileio);
*dev = nand;

4
src/flash/nand/tcl.c
View File

@@ -389,8 +389,8 @@ COMMAND_HANDLER(handle_nand_dump_command)
if (nand_fileio_finish(&s) == ERROR_OK)
{
command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
(long)s.fileio.size, duration_elapsed(&s.bench),
duration_kbps(&s.bench, s.fileio.size));
(long)fileio_size(&s.fileio), duration_elapsed(&s.bench),
duration_kbps(&s.bench, fileio_size(&s.fileio)));
}
return ERROR_OK;
}

8
src/flash/nor/tcl.c
View File

@@ -604,9 +604,9 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
return ERROR_OK;
}
buffer = malloc(fileio.size);
buffer = malloc(fileio_size(&fileio));
size_t buf_cnt;
if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
if (fileio_read(&fileio, fileio_size(&fileio), buffer, &buf_cnt) != ERROR_OK)
{
free(buffer);
fileio_close(&fileio);
@@ -622,8 +622,8 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
{
command_print(CMD_CTX, "wrote %ld bytes from file %s to flash bank %u"
" at offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
(long)fileio.size, CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
(long)fileio_size(&fileio), CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
}
fileio_close(&fileio);