imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash/nor/tcl.c: Do not double probe banks 

Previous to this version the code of handle_flash_probe_command would
probe a bank twice: first time by auto-probe through a call to
flash_command_get_bank and second time by calling the probe function
directly. This change adds a flash_command_get_bank_maybe_probe wich
is a more generic version of the flash_command_get_bank, that would
allow commands to decide whether auto-probing should be performed or
not.

Change-Id: If150ca9c169ffe05e8c7eba36338d333360811e3
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-on: http://openocd.zylin.com/2093
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Andrey Smirnov 2014-04-04 07:41:58 -07:00 committed by Spencer Oliver
parent e77b7447f7
commit 9a42454c2b
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,11 +31,18 @@
* Implements Tcl commands used to access NOR flash facilities.
*/
COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
struct flash_bank **bank)
COMMAND_HELPER(flash_command_get_bank_maybe_probe, unsigned name_index,
struct flash_bank **bank, bool do_probe)
{
const char *name = CMD_ARGV[name_index];
int retval = get_flash_bank_by_name(name, bank);
int retval;
if (do_probe) {
retval = get_flash_bank_by_name(name, bank);
} else {
*bank = get_flash_bank_by_name_noprobe(name);
retval = ERROR_OK;
}
if (retval != ERROR_OK)
return retval;
if (*bank)
@ -44,7 +51,20 @@ COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
unsigned bank_num;
COMMAND_PARSE_NUMBER(uint, name, bank_num);
return get_flash_bank_by_num(bank_num, bank);
if (do_probe) {
return get_flash_bank_by_num(bank_num, bank);
} else {
*bank = get_flash_bank_by_num_noprobe(bank_num);
retval = (bank) ? ERROR_OK : ERROR_FAIL;
return retval;
}
}
COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
struct flash_bank **bank)
{
return CALL_COMMAND_HANDLER(flash_command_get_bank_maybe_probe,
name_index, bank, true);
}
COMMAND_HANDLER(handle_flash_info_command)
@ -121,7 +141,7 @@ COMMAND_HANDLER(handle_flash_probe_command)
if (CMD_ARGC != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
retval = CALL_COMMAND_HANDLER(flash_command_get_bank_maybe_probe, 0, &p, false);
if (retval != ERROR_OK)
return retval;