diff options
Diffstat (limited to 'src/tools/imgtool/modules/cybiko.cpp')
-rw-r--r-- | src/tools/imgtool/modules/cybiko.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/tools/imgtool/modules/cybiko.cpp b/src/tools/imgtool/modules/cybiko.cpp index 489606328eb..f6e213fe6a2 100644 --- a/src/tools/imgtool/modules/cybiko.cpp +++ b/src/tools/imgtool/modules/cybiko.cpp @@ -252,32 +252,32 @@ static int cfs_file_find( cybiko_file_system *cfs, const char *filename, UINT16 return FALSE; } -static int cfs_verify( cybiko_file_system *cfs) +static int cfs_verify(cybiko_file_system &cfs) { UINT8 buffer[MAX_PAGE_SIZE]; int i, block_type; - for (i=0;i<cfs->page_count;i++) + for (i = 0; i < cfs.page_count; i++) { - if (!cfs_page_read( cfs, buffer, i)) return FALSE; - if (!cfs_page_to_block( cfs, i, &block_type, NULL)) return FALSE; - if (!page_buffer_verify( buffer, cfs->page_size, block_type)) return FALSE; + if (!cfs_page_read(&cfs, buffer, i)) return FALSE; + if (!cfs_page_to_block(&cfs, i, &block_type, NULL)) return FALSE; + if (!page_buffer_verify(buffer, cfs.page_size, block_type)) return FALSE; } return TRUE; } -static int cfs_init( cybiko_file_system *cfs, imgtool::stream *stream, int flash_type) +static int cfs_init(cybiko_file_system &cfs, imgtool::stream &stream, int flash_type) { - cfs->stream = stream; + cfs.stream = &stream; switch (flash_type) { - case FLASH_TYPE_AT45DB041 : cfs->page_count = 2048; cfs->page_size = 264; break; - case FLASH_TYPE_AT45DB081 : cfs->page_count = 4096; cfs->page_size = 264; break; - case FLASH_TYPE_AT45DB161 : cfs->page_count = 4096; cfs->page_size = 528; break; + case FLASH_TYPE_AT45DB041 : cfs.page_count = 2048; cfs.page_size = 264; break; + case FLASH_TYPE_AT45DB081 : cfs.page_count = 4096; cfs.page_size = 264; break; + case FLASH_TYPE_AT45DB161 : cfs.page_count = 4096; cfs.page_size = 528; break; default : return FALSE; } - cfs->block_count_boot = 5; - cfs->block_count_file = cfs->page_count - cfs->block_count_boot; - cfs->write_count = 0; + cfs.block_count_boot = 5; + cfs.block_count_file = cfs.page_count - cfs.block_count_boot; + cfs.write_count = 0; return TRUE; } @@ -345,15 +345,15 @@ static int flash_option_to_flash_type( int option) } } -static imgtoolerr_t cybiko_image_open( imgtool::image *image, imgtool::stream *stream) +static imgtoolerr_t cybiko_image_open(imgtool::image *image, imgtool::stream &stream) { cybiko_file_system *cfs = (cybiko_file_system*)image->extra_bytes(); int flash_type; // init - flash_type = flash_size_to_flash_type( stream->size()); - if (!cfs_init( cfs, stream, flash_type)) return IMGTOOLERR_CORRUPTIMAGE; + flash_type = flash_size_to_flash_type(stream.size()); + if (!cfs_init(*cfs, stream, flash_type)) return IMGTOOLERR_CORRUPTIMAGE; // verify - if (!cfs_verify( cfs)) return IMGTOOLERR_CORRUPTIMAGE; + if (!cfs_verify(*cfs)) return IMGTOOLERR_CORRUPTIMAGE; // ok return IMGTOOLERR_SUCCESS; } @@ -364,15 +364,15 @@ static void cybiko_image_close( imgtool::image *image) delete cfs->stream; } -static imgtoolerr_t cybiko_image_create( imgtool::image *image, imgtool::stream *stream, util::option_resolution *opts) +static imgtoolerr_t cybiko_image_create( imgtool::image *image, imgtool::stream &stream, util::option_resolution *opts) { cybiko_file_system *cfs = (cybiko_file_system*)image->extra_bytes(); int flash_type; // init flash_type = flash_option_to_flash_type(opts->lookup_int('F')); - if (!cfs_init( cfs, stream, flash_type)) return IMGTOOLERR_CORRUPTIMAGE; + if (!cfs_init(*cfs, stream, flash_type)) return IMGTOOLERR_CORRUPTIMAGE; // format - if (!cfs_format( cfs)) return IMGTOOLERR_CORRUPTIMAGE; + if (!cfs_format(cfs)) return IMGTOOLERR_CORRUPTIMAGE; // ok return IMGTOOLERR_SUCCESS; } @@ -423,7 +423,7 @@ static void cybiko_image_close_enum( imgtool::directory *enumeration) // nothing } -static imgtoolerr_t cybiko_image_free_space( imgtool::partition *partition, UINT64 *size) +static imgtoolerr_t cybiko_image_free_space(imgtool::partition *partition, UINT64 *size) { imgtool::image *image = &partition->image(); cybiko_file_system *cfs = (cybiko_file_system*)image->extra_bytes(); @@ -431,7 +431,7 @@ static imgtoolerr_t cybiko_image_free_space( imgtool::partition *partition, UINT return IMGTOOLERR_SUCCESS; } -static imgtoolerr_t cybiko_image_read_file( imgtool::partition *partition, const char *filename, const char *fork, imgtool::stream *destf) +static imgtoolerr_t cybiko_image_read_file(imgtool::partition *partition, const char *filename, const char *fork, imgtool::stream &destf) { imgtool::image *image = &partition->image(); cybiko_file_system *cfs = (cybiko_file_system*)image->extra_bytes(); @@ -449,7 +449,7 @@ static imgtoolerr_t cybiko_image_read_file( imgtool::partition *partition, const if (!cfs_block_read( cfs, buffer, BLOCK_TYPE_FILE, i)) return IMGTOOLERR_READERROR; if (BLOCK_USED(buffer) && (BLOCK_FILE_ID(buffer) == file_id) && (BLOCK_PART_ID(buffer) == part_id)) { - destf->write(buffer + 6 + ((part_id == 0) ? FILE_HEADER_SIZE : 0), buffer[1]); + destf.write(buffer + 6 + ((part_id == 0) ? FILE_HEADER_SIZE : 0), buffer[1]); part_id++; } } @@ -458,7 +458,7 @@ static imgtoolerr_t cybiko_image_read_file( imgtool::partition *partition, const return IMGTOOLERR_SUCCESS; } -static imgtoolerr_t cybiko_image_write_file( imgtool::partition *partition, const char *filename, const char *fork, imgtool::stream *sourcef, util::option_resolution *opts) +static imgtoolerr_t cybiko_image_write_file(imgtool::partition *partition, const char *filename, const char *fork, imgtool::stream &sourcef, util::option_resolution *opts) { imgtool::image *image = &partition->image(); cybiko_file_system *cfs = (cybiko_file_system*)image->extra_bytes(); @@ -468,22 +468,22 @@ static imgtoolerr_t cybiko_image_write_file( imgtool::partition *partition, cons cfs_file file; int i; // find file - if (!cfs_file_find( cfs, filename, &file_id)) file_id = INVALID_FILE_ID; + if (!cfs_file_find(cfs, filename, &file_id)) file_id = INVALID_FILE_ID; // check free space free_blocks = cfs_calc_free_blocks( cfs); if (file_id != INVALID_FILE_ID) { - if (!cfs_file_info( cfs, file_id, &file)) return IMGTOOLERR_UNEXPECTED; + if (!cfs_file_info(cfs, file_id, &file)) return IMGTOOLERR_UNEXPECTED; free_blocks += file.blocks; } - if (cfs_calc_free_space( cfs, free_blocks) < sourcef->size()) return IMGTOOLERR_NOSPACE; + if (cfs_calc_free_space(cfs, free_blocks) < sourcef.size()) return IMGTOOLERR_NOSPACE; // delete file if (file_id != INVALID_FILE_ID) { if (!cfs_file_delete( cfs, file_id)) return IMGTOOLERR_UNEXPECTED; } // create/write destination file - bytes_left = sourcef->size(); + bytes_left = sourcef.size(); i = 0; while ((bytes_left > 0) && (i < cfs->block_count_file)) { @@ -500,13 +500,13 @@ static imgtoolerr_t cybiko_image_write_file( imgtool::partition *partition, cons if (part_id == 0) { buffer[6] = 0; - strcpy( BLOCK_FILENAME(buffer), filename); + strcpy(BLOCK_FILENAME(buffer), filename); buffer_write_32_be( buffer + 6 + FILE_HEADER_SIZE - 4, time_setup( time( NULL))); - sourcef->read(buffer + 6 + FILE_HEADER_SIZE, buffer[1]); + sourcef.read(buffer + 6 + FILE_HEADER_SIZE, buffer[1]); } else { - sourcef->read(buffer + 6, buffer[1]); + sourcef.read(buffer + 6, buffer[1]); } if (!cfs_block_write( cfs, buffer, BLOCK_TYPE_FILE, i)) return IMGTOOLERR_WRITEERROR; bytes_left -= buffer[1]; |