interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve at91sam3.c command argument parsing.

This commit is contained in:
Zachary T Welch 2009-10-22 22:33:12 -07:00
parent 93ab9ce888
commit 5e0ee6ab08
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/flash/at91sam3.c
View File

@ -2347,7 +2347,6 @@ static int
sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc) sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc)
{ {
unsigned x,v; unsigned x,v;
uint32_t v32;
int r,who; int r,who;
struct sam3_chip *pChip; struct sam3_chip *pChip;
@ -2391,11 +2390,8 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a
if ((0 == strcmp(argv[0], "show")) && (0 == strcmp(argv[1], "all"))) { if ((0 == strcmp(argv[0], "show")) && (0 == strcmp(argv[1], "all"))) {
who = -1; who = -1;
} else { } else {
r = parse_u32(argv[1], &v32); uint32_t v32;
if (r != ERROR_OK) { COMMAND_PARSE_NUMBER(u32, argv[1], v32);
command_print(cmd_ctx, "Not a number: %s", argv[1]);
return r;
}
who = v32; who = v32;
} }
break; break;
@ -2444,9 +2440,6 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a
static int static int
sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc) sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc)
{ {
uint32_t v;
int r;
struct sam3_chip *pChip; struct sam3_chip *pChip;
pChip = get_current_sam3(cmd_ctx); pChip = get_current_sam3(cmd_ctx);
@ -2460,8 +2453,10 @@ sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char *
// show // show
break; break;
case 1: case 1:
{
// set // set
r = parse_u32(argv[0], &v); uint32_t v;
COMMAND_PARSE_NUMBER(u32, argv[0], v);
if (v > 200000) { if (v > 200000) {
// absurd slow clock of 200Khz? // absurd slow clock of 200Khz?
command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v)); command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v));
@ -2469,7 +2464,7 @@ sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char *
} }
pChip->cfg.slow_freq = v; pChip->cfg.slow_freq = v;
break; break;
}
default: default:
// error // error
command_print(cmd_ctx,"Too many parameters"); command_print(cmd_ctx,"Too many parameters");