Improve xscale command argument parsing.

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

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index f941922a5655245d84ccf351a29d43a4e6d0abcb..72a24b4c8bb38d412c8637dd3f4ec0f0d6901fd6 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -47,7 +47,6 @@
 
 /* forward declarations */
 static int arm9tdmi_target_create(struct target_s *target, Jim_Interp *interp);
-static int arm9tdmi_quit(void);
 
 target_type_t arm9tdmi_target =
 {
@@ -85,7 +84,6 @@ target_type_t arm9tdmi_target =
        .target_create = arm9tdmi_target_create,
        .init_target = arm9tdmi_init_target,
        .examine = arm9tdmi_examine,
-       .quit = arm9tdmi_quit
 };
 
 static arm9tdmi_vector_t arm9tdmi_vectors[] =
@@ -95,7 +93,6 @@ static arm9tdmi_vector_t arm9tdmi_vectors[] =
        {"swi", ARM9TDMI_SWI_VECTOR},
        {"pabt", ARM9TDMI_PABT_VECTOR},
        {"dabt", ARM9TDMI_DABT_VECTOR},
-       {"reserved", ARM9TDMI_RESERVED_VECTOR},
        {"irq", ARM9TDMI_IRQ_VECTOR},
        {"fiq", ARM9TDMI_FIQ_VECTOR},
        {0, 0},
@@ -860,11 +857,6 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
        return ERROR_OK;
 }
 
-static int arm9tdmi_quit(void)
-{
-       return ERROR_OK;
-}
-
 int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
 {
        armv4_5_common_t *armv4_5;
@@ -903,7 +895,6 @@ int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_
        arm7_9->enable_single_step = arm9tdmi_enable_single_step;
        arm7_9->disable_single_step = arm9tdmi_disable_single_step;
 
-       arm7_9->pre_debug_entry = NULL;
        arm7_9->post_debug_entry = NULL;
 
        arm7_9->pre_restore_context = NULL;
@@ -1043,14 +1034,11 @@ static int handle_arm9tdmi_catch_vectors_command(
                embeddedice_store_reg(vector_catch);
        }
 
-       /* output current settings (skip RESERVED vector) */
-       for (i = 0; i < 8; i++)
-       {
-               if (i != 5)
-               {
-                       command_print(cmd_ctx, "%s: %s", arm9tdmi_vectors[i].name,
-                               (vector_catch_value & (1 << i)) ? "catch" : "don't catch");
-               }
+       /* output current settings */
+       for (i = 0; arm9tdmi_vectors[i].name; i++) {
+               command_print(cmd_ctx, "%s: %s", arm9tdmi_vectors[i].name,
+                       (vector_catch_value & arm9tdmi_vectors[i].value)
+                               ? "catch" : "don't catch");
        }
 
        return ERROR_OK;
@@ -1062,14 +1050,12 @@ int arm9tdmi_register_commands(struct command_context_s *cmd_ctx)
        command_t *arm9tdmi_cmd;
 
        retval = arm7_9_register_commands(cmd_ctx);
-       arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9tdmi",
+       arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9",
                        NULL, COMMAND_ANY,
-                       "arm9tdmi specific commands");
+                       "arm9 specific commands");
        register_command(cmd_ctx, arm9tdmi_cmd, "vector_catch",
                        handle_arm9tdmi_catch_vectors_command, COMMAND_EXEC,
-                       "arm9 vector_catch [all|none|reset|undef|swi|pabt|dabt|reserved|irq|fiq] - separate vectors to catch by space");
-
-
+                       "arm9 vector_catch [all|none|reset|undef|swi|pabt|dabt|irq|fiq] ...");
 
        return retval;
 }