From 815c3b353307796fb4d86a1880679dacaed00b6e Mon Sep 17 00:00:00 2001 From: oharboe Date: Mon, 25 Feb 2008 07:32:52 +0000 Subject: - "flash write_binary" is now "flash write_bank" to clarify the focus of the command and reduce confusion with "flash write_image". - retired deprecated "flash erase" & "flash write". - added flash_driver_protect/write/erase() that are wafer thin frontend functions to low level driver functions. They implement checks that were inconsistently handled by the drivers, e.g. check for target halted was done in a spotty fashion. - use return ERROR_COMMAND_SYNTAX_ERROR to print out syntax of command instead of having lots of inlined replicas of the command line syntax(some of which were wrong). - use logging instead of dubious translation of error values to human understandable explanations of why things failed. The lower levels log the precise reason and the higher levels can ammend context as the error propagates up the call stack. - simplified flash API slightly with logging instead of allocating and returning information that the caller then has to translate into print statements. git-svn-id: svn://svn.berlios.de/openocd/trunk@337 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/cfi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/flash/cfi.c') diff --git a/src/flash/cfi.c b/src/flash/cfi.c index 66a1c656..82120d8d 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -1375,11 +1375,11 @@ int cfi_spansion_write_block(struct flash_bank_s *bank, u8 *buffer, u32 address, } /* allocate working area */ - if (target_alloc_working_area(target, 24 * 4, - &cfi_info->write_algorithm) != ERROR_OK) + retval=target_alloc_working_area(target, 24 * 4, + &cfi_info->write_algorithm); + if (retval != ERROR_OK) { - WARNING("no working area available, can't do block memory writes"); - return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; + return retval; } /* write algorithm code to working area */ @@ -1645,11 +1645,6 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) int i; int retval; - if (bank->target->state != TARGET_HALTED) - { - return ERROR_TARGET_NOT_HALTED; - } - if (offset + count > bank->size) return ERROR_FLASH_DST_OUT_OF_BANK; -- cgit v1.2.3