summaryrefslogtreecommitdiff
path: root/src/target/etm.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-10-22 08:15:37 -0700
committerZachary T Welch <zw@superlucidity.net>2009-11-05 18:03:20 -0800
commitd660721ba8821aa92248bddcbeefde1b3e629744 (patch)
tree9b1a198d0ce18cab48fb28f8d6baa519de533e20 /src/target/etm.c
parent04b8a2a6f3e85fc701ce19c8c5999ab8a75964cd (diff)
downloadopenocd_libswd-d660721ba8821aa92248bddcbeefde1b3e629744.tar.gz
openocd_libswd-d660721ba8821aa92248bddcbeefde1b3e629744.tar.bz2
openocd_libswd-d660721ba8821aa92248bddcbeefde1b3e629744.tar.xz
openocd_libswd-d660721ba8821aa92248bddcbeefde1b3e629744.zip
Improve etm command argument parsing.
Diffstat (limited to 'src/target/etm.c')
-rw-r--r--src/target/etm.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/target/etm.c b/src/target/etm.c
index 51065817..0f5a96f6 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -1203,7 +1203,9 @@ static int handle_etm_tracemode_command(struct command_context_s *cmd_ctx, char
return ERROR_OK;
}
- switch (strtol(args[1], NULL, 0))
+ uint8_t context_id;
+ COMMAND_PARSE_NUMBER(u8, args[1], context_id);
+ switch (context_id)
{
case 0:
tracemode |= ETMV1_CONTEXTID_NONE;
@@ -1376,7 +1378,9 @@ static int handle_etm_config_command(struct command_context_s *cmd_ctx, char *cm
return ERROR_FAIL;
}
- switch (strtoul(args[1], NULL, 0))
+ uint8_t port_width;
+ COMMAND_PARSE_NUMBER(u8, args[1], port_width);
+ switch (port_width)
{
case 4:
portmode |= ETM_PORT_4BIT;
@@ -1688,7 +1692,7 @@ static int handle_etm_image_command(struct command_context_s *cmd_ctx, char *cmd
if (argc >= 2)
{
etm_ctx->image->base_address_set = 1;
- etm_ctx->image->base_address = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(int, args[1], etm_ctx->image->base_address);
}
else
{
@@ -1880,7 +1884,8 @@ static int handle_etm_trigger_percent_command(struct command_context_s *cmd_ctx,
if (argc > 0)
{
- uint32_t new_value = strtoul(args[0], NULL, 0);
+ uint32_t new_value;
+ COMMAND_PARSE_NUMBER(u32, args[0], new_value);
if ((new_value < 2) || (new_value > 100))
{