Improve trace command argument parsing.

[openocd.git] / src / target / arm966e.c

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 67ff8a6b452a11524bc005487af391fd8bca6c3b..5770895b901a79bde1713ff071cc1f142133a658 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,13 +32,9 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-/* cli handling */
-int arm966e_register_commands(struct command_context_s *cmd_ctx);
-
 /* forward declarations */
 int arm966e_target_create(struct target_s *target, Jim_Interp *interp);
 int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm966e_quit(void);
 
 target_type_t arm966e_target =
 {
@@ -76,7 +72,6 @@ target_type_t arm966e_target =
        .target_create = arm966e_target_create,
        .init_target = arm966e_init_target,
        .examine = arm9tdmi_examine,
-       .quit = arm966e_quit,
 };
 
 int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
@@ -86,11 +81,6 @@ int arm966e_init_target(struct command_context_s *cmd_ctx, struct target_s *targ
        return ERROR_OK;
 }
 
-int arm966e_quit(void)
-{
-       return ERROR_OK;
-}
-
 int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap)
 {
        arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
@@ -110,7 +100,7 @@ int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap
        return ERROR_OK;
 }
 
-int arm966e_target_create( struct target_s *target, Jim_Interp *interp )
+int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
 {
        arm966e_common_t *arm966e = calloc(1,sizeof(arm966e_common_t));
 
@@ -280,7 +270,8 @@ int arm966e_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, ch
        /* one or more argument, access a single register (write if second argument is given */
        if (argc >= 1)
        {
-               int address = strtoul(args[0], NULL, 0);
+               uint32_t address;
+               COMMAND_PARSE_NUMBER(u32, args[0], address);
 
                if (argc == 1)
                {
@@ -299,7 +290,8 @@ int arm966e_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, ch
                }
                else if (argc == 2)
                {
-                       uint32_t value = strtoul(args[1], NULL, 0);
+                       uint32_t value;
+                       COMMAND_PARSE_NUMBER(u32, args[1], value);
                        if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
                        {
                                command_print(cmd_ctx, "couldn't access reg %i", address);