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

Improve pic32mx.c command argument parsing.

This commit is contained in:
Zachary T Welch 2009-10-22 22:33:12 -07:00
parent ee4723c494
commit fc116380bf
1 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/flash/pic32mx.c
View File

@ -724,7 +724,6 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
#if 0 #if 0
int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
flash_bank_t *bank;
target_t *target = NULL; target_t *target = NULL;
pic32mx_flash_bank_t *pic32mx_info = NULL; pic32mx_flash_bank_t *pic32mx_info = NULL;
@ -734,12 +733,10 @@ int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, ch
return ERROR_OK; return ERROR_OK;
} }
bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); flash_bank_t *bank;
if (!bank) int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
{ if (ERROR_OK != retval)
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return retval;
return ERROR_OK;
}
pic32mx_info = bank->driver_priv; pic32mx_info = bank->driver_priv;
@ -773,7 +770,6 @@ int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, ch
int pic32mx_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) int pic32mx_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
flash_bank_t *bank;
target_t *target = NULL; target_t *target = NULL;
pic32mx_flash_bank_t *pic32mx_info = NULL; pic32mx_flash_bank_t *pic32mx_info = NULL;
@ -783,12 +779,10 @@ int pic32mx_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd,
return ERROR_OK; return ERROR_OK;
} }
bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); flash_bank_t *bank;
if (!bank) int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
{ if (ERROR_OK != retval)
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return retval;
return ERROR_OK;
}
pic32mx_info = bank->driver_priv; pic32mx_info = bank->driver_priv;
@ -867,7 +861,6 @@ static int pic32mx_chip_erase(struct flash_bank_s *bank)
static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
#if 0 #if 0
flash_bank_t *bank;
int i; int i;
if (argc != 0) if (argc != 0)
@ -876,12 +869,10 @@ static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx,
return ERROR_OK; return ERROR_OK;
} }
bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); flash_bank_t *bank;
if (!bank) int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
{ if (ERROR_OK != retval)
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return retval;
return ERROR_OK;
}
if (pic32mx_chip_erase(bank) == ERROR_OK) if (pic32mx_chip_erase(bank) == ERROR_OK)
{ {
@ -904,7 +895,6 @@ static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx,
static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
flash_bank_t *bank;
uint32_t address, value; uint32_t address, value;
int status, res; int status, res;
@ -914,15 +904,14 @@ static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, ch
return ERROR_OK; return ERROR_OK;
} }
address = strtoul(args[0], NULL, 0); COMMAND_PARSE_NUMBER(u32, args[0], address);
value = strtoul(args[1], NULL, 0); COMMAND_PARSE_NUMBER(u32, args[1], value);
flash_bank_t *bank;
int retval = flash_command_get_bank_by_num(cmd_ctx, args[2], &bank);
if (ERROR_OK != retval)
return retval;
bank = get_flash_bank_by_num(strtoul(args[2], NULL, 0));
if (!bank)
{
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[2]);
return ERROR_OK;
}
if (address < bank->base || address >= (bank->base + bank->size)) if (address < bank->base || address >= (bank->base + bank->size))
{ {
command_print(cmd_ctx, "flash address '%s' is out of bounds", args[0]); command_print(cmd_ctx, "flash address '%s' is out of bounds", args[0]);