interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use COMMAND_PARSE_ON_OFF where appropriate 

Updates all command parsing of "on" and "off" arguments.
This commit is contained in:
Zachary T Welch 2009-11-18 05:22:44 -08:00
parent bd5a1799ea
commit 75a37eb5b3
5 changed files with 17 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/flash/flash.c
View File

@ -577,7 +577,6 @@ COMMAND_HANDLER(handle_flash_protect_command)
uint32_t bank_nr; uint32_t bank_nr;
uint32_t first; uint32_t first;
uint32_t last; uint32_t last;
int set;
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
struct flash_bank *p = get_flash_bank_by_num(bank_nr); struct flash_bank *p = get_flash_bank_by_num(bank_nr);
@ -590,12 +589,8 @@ COMMAND_HANDLER(handle_flash_protect_command)
else else
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last); COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
if (strcmp(CMD_ARGV[3], "on") == 0) bool set;
set = 1; COMMAND_PARSE_ON_OFF(CMD_ARGV[3], set);
else if (strcmp(CMD_ARGV[3], "off") == 0)
set = 0;
else
return ERROR_COMMAND_SYNTAX_ERROR;
int retval; int retval;
if ((retval = flash_check_sector_parameters(CMD_CTX, if ((retval = flash_check_sector_parameters(CMD_CTX,

7
src/jtag/parport.c
View File

@ -103,7 +103,7 @@ static struct cable cables[] =
/* configuration */ /* configuration */
static char* parport_cable = NULL; static char* parport_cable = NULL;
static uint16_t parport_port; static uint16_t parport_port;
static int parport_exit = 0; static bool parport_exit = 0;
static uint32_t parport_toggling_time_ns = 1000; static uint32_t parport_toggling_time_ns = 1000;
static int wait_states; static int wait_states;
@ -453,10 +453,7 @@ COMMAND_HANDLER(parport_handle_write_on_exit_command)
return ERROR_OK; return ERROR_OK;
} }
if (strcmp(CMD_ARGV[0], "on") == 0) COMMAND_PARSE_ON_OFF(CMD_ARGV[0], parport_exit);
parport_exit = 1;
else if (strcmp(CMD_ARGV[0], "off") == 0)
parport_exit = 0;
return ERROR_OK; return ERROR_OK;
} }

15
src/jtag/zy1000/zy1000.c
View File

@ -236,18 +236,9 @@ int handle_power_command(struct command_context *cmd_ctx, char *cmd, char **args
if (argc == 1) if (argc == 1)
{ {
if (strcmp(args[0], "on") == 0) bool enable;
{ COMMAND_PARSE_ON_OFF(args[0], enable);
setPower(1); setPower(enable);
}
else if (strcmp(args[0], "off") == 0)
{
setPower(0);
} else
{
command_print(cmd_ctx, "arg is \"on\" or \"off\"");
return ERROR_INVALID_ARGUMENTS;
}
} }
command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off"); command_print(cmd_ctx, "Target power %s", savePower ? "on" : "off");

17
src/target/cortex_m3.c
View File

@ -1898,18 +1898,11 @@ COMMAND_HANDLER(handle_cortex_m3_mask_interrupts_command)
if (CMD_ARGC > 0) if (CMD_ARGC > 0)
{ {
if (!strcmp(CMD_ARGV[0], "on")) bool enable;
{ COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
cortex_m3_write_debug_halt_mask(target, C_HALT | C_MASKINTS, 0); uint32_t mask_on = C_HALT | (enable ? C_MASKINTS : 0);
} uint32_t mask_off = enable ? 0 : C_MASKINTS;
else if (!strcmp(CMD_ARGV[0], "off")) cortex_m3_write_debug_halt_mask(target, mask_on, mask_off);
{
cortex_m3_write_debug_halt_mask(target, C_HALT, C_MASKINTS);
}
else
{
command_print(CMD_CTX, "usage: cortex_m3 maskisr ['on'|'off']");
}
} }
command_print(CMD_CTX, "cortex_m3 interrupt mask %s", command_print(CMD_CTX, "cortex_m3 interrupt mask %s",

19
src/target/target.c
View File

@ -2003,23 +2003,14 @@ COMMAND_HANDLER(handle_poll_command)
return retval; return retval;
if ((retval = target_arch_state(target)) != ERROR_OK) if ((retval = target_arch_state(target)) != ERROR_OK)
return retval; return retval;
} }
else if (CMD_ARGC == 1) else if (CMD_ARGC == 1)
{ {
if (strcmp(CMD_ARGV[0], "on") == 0) bool enable;
{ COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
jtag_poll_set_enabled(true); jtag_poll_set_enabled(enable);
} }
else if (strcmp(CMD_ARGV[0], "off") == 0) else
{
jtag_poll_set_enabled(false);
}
else
{
command_print(CMD_CTX, "arg is \"on\" or \"off\"");
}
} else
{ {
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
} }