From 55f2fe830a541a297d6bf3906c6a28df81acbf05 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Thu, 20 Dec 2007 16:19:10 +0000 Subject: - removed flash write_image - binary compare function has been moved to verify_image command - minor code reformat and cleanup - updated docs to include new commands git-svn-id: svn://svn.berlios.de/openocd/trunk@243 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/flash.c | 215 ++++++++++++++++++++++-------------------------------- src/flash/flash.h | 9 +-- 2 files changed, 89 insertions(+), 135 deletions(-) (limited to 'src/flash') diff --git a/src/flash/flash.c b/src/flash/flash.c index 734decb3..fe225f0c 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -49,7 +49,6 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_flash_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); @@ -117,8 +116,6 @@ int flash_init(struct command_context_s *cmd_ctx) "write binary "); register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC, "write_image [offset] [type]"); - register_command(cmd_ctx, flash_cmd, "verify_image", handle_flash_verify_image_command, COMMAND_EXEC, - "verify_image [offset] [type]"); register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC, "set protection of sectors at "); register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_EXEC, @@ -364,69 +361,71 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } -static void printError(struct command_context_s *cmd_ctx, flash_bank_t *p, int retval) -{ - if (retval==ERROR_OK) - return; - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "can't work with this flash while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - command_print(cmd_ctx, "usage: flash write "); - break; - case ERROR_FLASH_BANK_INVALID: - command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); - break; - case ERROR_FLASH_OPERATION_FAILED: - command_print(cmd_ctx, "flash program error"); - break; - case ERROR_FLASH_DST_BREAKS_ALIGNMENT: - command_print(cmd_ctx, "offset breaks required alignment"); - break; - case ERROR_FLASH_DST_OUT_OF_BANK: - command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)"); - break; - case ERROR_FLASH_SECTOR_NOT_ERASED: - command_print(cmd_ctx, "destination sector(s) not erased"); - break; - default: - command_print(cmd_ctx, "unknown error"); -} -} - - int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *p; - + int retval; + int address; + int length; + duration_t duration; + char *duration_text; + target_t *target = get_current_target(cmd_ctx); if (argc != 2) { - command_print(cmd_ctx, "usage: flash erase_address
"); + command_print(cmd_ctx, "usage: flash erase_address
"); return ERROR_OK; } - int address=strtoul(args[0], NULL, 0); - int length=strtoul(args[1], NULL, 0); - if (length<=0) + address = strtoul(args[0], NULL, 0); + length = strtoul(args[1], NULL, 0); + if (length <= 0) { command_print(cmd_ctx, "Length must be >0"); return ERROR_INVALID_ARGUMENTS; } p = get_flash_bank_by_addr(target, address); - if (p==NULL) + if (p == NULL) { command_print(cmd_ctx, "No flash at that address"); return ERROR_INVALID_ARGUMENTS; } - int retval=flash_erase(target, address, length); - printError(cmd_ctx, p, retval); - return retval; + duration_start_measure(&duration); + + if ((retval = flash_erase(target, address, length)) != ERROR_OK) + { + switch (retval) + { + case ERROR_TARGET_NOT_HALTED: + command_print(cmd_ctx, "can't work with this flash while target is running"); + break; + case ERROR_INVALID_ARGUMENTS: + command_print(cmd_ctx, "usage: flash erase_address
"); + break; + case ERROR_FLASH_BANK_INVALID: + command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); + break; + case ERROR_FLASH_OPERATION_FAILED: + command_print(cmd_ctx, "flash erase error"); + break; + case ERROR_FLASH_SECTOR_INVALID: + command_print(cmd_ctx, "sector number(s) invalid"); + break; + default: + command_print(cmd_ctx, "unknown error"); + } + } + else + { + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text); + free(duration_text); + } + + return retval; } int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) @@ -589,7 +588,7 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c return ERROR_OK; } -int handle_flash_write_image_command_core(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, enum flash_image_op op) +int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); @@ -641,17 +640,9 @@ int handle_flash_write_image_command_core(struct command_context_s *cmd_ctx, cha failed = malloc(sizeof(int) * image.num_sections); - error_str=NULL; - - retval=ERROR_OK; - if ((op==flash_image_op_write)&&auto_erase) - { - retval = flash_image_operation(target, &image, &written, &error_str, failed, flash_image_op_erase); - } - if (retval == ERROR_OK) - { - retval = flash_image_operation(target, &image, &written, &error_str, failed, op); - } + error_str = NULL; + + retval = flash_write(target, &image, &written, &error_str, failed, auto_erase); if (retval != ERROR_OK) { @@ -675,11 +666,9 @@ int handle_flash_write_image_command_core(struct command_context_s *cmd_ctx, cha } duration_stop_measure(&duration, &duration_text); - command_print(cmd_ctx, "%s %u byte from file %s in %s (%f kb/s)", - (op==flash_image_op_write)?"wrote":"verified", + command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)", written, args[0], duration_text, (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); - free(duration_text); free(failed); @@ -688,16 +677,6 @@ int handle_flash_write_image_command_core(struct command_context_s *cmd_ctx, cha return ERROR_OK; } - -int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - return handle_flash_write_image_command_core(cmd_ctx, cmd, args, argc, flash_image_op_write); -} -int handle_flash_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - return handle_flash_write_image_command_core(cmd_ctx, cmd, args, argc, flash_image_op_verify); -} - int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u32 offset; @@ -745,7 +724,33 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c { command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x", args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0)); - printError(cmd_ctx, p, retval); + + switch (retval) + { + case ERROR_TARGET_NOT_HALTED: + command_print(cmd_ctx, "can't work with this flash while target is running"); + break; + case ERROR_INVALID_ARGUMENTS: + command_print(cmd_ctx, "usage: flash write "); + break; + case ERROR_FLASH_BANK_INVALID: + command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); + break; + case ERROR_FLASH_OPERATION_FAILED: + command_print(cmd_ctx, "flash program error"); + break; + case ERROR_FLASH_DST_BREAKS_ALIGNMENT: + command_print(cmd_ctx, "offset breaks required alignment"); + break; + case ERROR_FLASH_DST_OUT_OF_BANK: + command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)"); + break; + case ERROR_FLASH_SECTOR_NOT_ERASED: + command_print(cmd_ctx, "destination sector(s) not erased"); + break; + default: + command_print(cmd_ctx, "unknown error"); + } } free(buffer); @@ -823,8 +828,8 @@ int flash_erase(target_t *target, u32 addr, u32 length) return c->driver->erase(c, first, last); } -/* perform an operation on flash using an image: verify, erase or write. */ -int flash_image_operation(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, enum flash_image_op op) +/* write (optional verify) an image to flash memory of the given target */ +int flash_write(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, int erase) { int retval; int i; @@ -850,8 +855,8 @@ int flash_image_operation(target_t *target, image_t *image, u32 *written, char * u8 *buffer; int section_first; int section_last; - u32 run_address = image->sections[section].base_address+section_offset; - u32 run_size = image->sections[section].size-section_offset; + u32 run_address = image->sections[section].base_address + section_offset; + u32 run_size = image->sections[section].size - section_offset; if (image->sections[section].size == 0) { @@ -943,57 +948,16 @@ int flash_image_operation(target_t *target, image_t *image, u32 *written, char * retval = ERROR_OK; - switch (op) + if (erase) { - case flash_image_op_erase: - /* calculate and erase sectors */ - retval = flash_erase( target, run_address, run_size ); - break; - - case flash_image_op_write: - /* write flash sectors */ - retval = c->driver->write(c, buffer, run_address - c->base, run_size); - break; - - case flash_image_op_verify: - { - // Verify - u8 *data; - data=(u8 *)malloc(run_size); - if (data==NULL) - retval = ERROR_INVALID_ARGUMENTS; // exception handling would be nice... - - // Can we use long word accesses? - int size=1; - int count=run_size; - if ((count%4)==0) - { - size*=4; - count/=4; - } - retval = target->type->read_memory(target, run_address, size, count, data); + /* calculate and erase sectors */ + retval = flash_erase( target, run_address, run_size ); + } - if (retval == ERROR_OK) - { - int i; - for (i=0; idriver->write(c, buffer, run_address - c->base, run_size); } free(buffer); @@ -1053,6 +1017,3 @@ int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd return ERROR_OK; } - - - diff --git a/src/flash/flash.h b/src/flash/flash.h index b90b64eb..e8f91500 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -63,18 +63,11 @@ typedef struct flash_bank_s struct flash_bank_s *next; } flash_bank_t; -enum flash_image_op -{ - flash_image_op_write = 0, - flash_image_op_verify, - flash_image_op_erase -}; - extern int flash_register_commands(struct command_context_s *cmd_ctx); extern int flash_init(struct command_context_s *cmd_ctx); extern int flash_erase(target_t *target, u32 addr, u32 length); -extern int flash_image_operation(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, enum flash_image_op op); +extern int flash_write(target_t *target, image_t *image, u32 *written, char **error, int *failed, int erase); extern flash_bank_t *get_flash_bank_by_num(int num); extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); -- cgit v1.2.3