only display usable commands in help

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

diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index 08e546012efa849f0a330a314c53ea87d21c2fae..8402081dfc947a2b20caa2e18b7ad6c0e407a38e 100644 (file)
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -1246,6 +1246,21 @@ static int cortex_a8_assert_reset(struct target *target)
 
        LOG_DEBUG(" ");
 
+       /* FIXME when halt is requested, make it work somehow... */
+
+       /* Issue some kind of warm reset. */
+       if (target_has_event_action(target, TARGET_EVENT_RESET_ASSERT)) {
+               target_handle_event(target, TARGET_EVENT_RESET_ASSERT);
+       } else if (jtag_get_reset_config() & RESET_HAS_SRST) {
+               /* REVISIT handle "pulls" cases, if there's
+                * hardware that needs them to work.
+                */
+               jtag_add_reset(0, 1);
+       } else {
+               LOG_ERROR("%s: how to reset?", target_name(target));
+               return ERROR_FAIL;
+       }
+
        /* registers are now invalid */
        register_cache_invalidate(armv7a->armv4_5_common.core_cache);
 
@@ -1256,14 +1271,22 @@ static int cortex_a8_assert_reset(struct target *target)
 
 static int cortex_a8_deassert_reset(struct target *target)
 {
+       int retval;
 
        LOG_DEBUG(" ");
 
-       if (target->reset_halt)
-       {
-               int retval;
-               if ((retval = target_halt(target)) != ERROR_OK)
-                       return retval;
+       /* be certain SRST is off */
+       jtag_add_reset(0, 0);
+
+       retval = cortex_a8_poll(target);
+
+       if (target->reset_halt) {
+               if (target->state != TARGET_HALTED) {
+                       LOG_WARNING("%s: ran after reset and before halt ...",
+                                       target_name(target));
+                       if ((retval = target_halt(target)) != ERROR_OK)
+                               return retval;
+               }
        }
 
        return ERROR_OK;
@@ -1625,29 +1648,36 @@ COMMAND_HANDLER(cortex_a8_handle_dbginit_command)
        return ERROR_OK;
 }
 
-
-static int cortex_a8_register_commands(struct command_context *cmd_ctx)
-{
-       struct command *cortex_a8_cmd;
-       int retval = ERROR_OK;
-
-       armv4_5_register_commands(cmd_ctx);
-       armv7a_register_commands(cmd_ctx);
-
-       cortex_a8_cmd = register_command(cmd_ctx, NULL, "cortex_a8",
-                       NULL, COMMAND_ANY,
-                       "cortex_a8 specific commands");
-
-       register_command(cmd_ctx, cortex_a8_cmd, "cache_info",
-                       cortex_a8_handle_cache_info_command, COMMAND_EXEC,
-                       "display information about target caches");
-
-       register_command(cmd_ctx, cortex_a8_cmd, "dbginit",
-                       cortex_a8_handle_dbginit_command, COMMAND_EXEC,
-                       "Initialize core debug");
-
-       return retval;
-}
+static const struct command_registration cortex_a8_exec_command_handlers[] = {
+       {
+               .name = "cache_info",
+               .handler = &cortex_a8_handle_cache_info_command,
+               .mode = COMMAND_EXEC,
+               .help = "display information about target caches",
+       },
+       {
+               .name = "dbginit",
+               .handler = &cortex_a8_handle_dbginit_command,
+               .mode = COMMAND_EXEC,
+               .help = "Initialize core debug",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration cortex_a8_command_handlers[] = {
+       {
+               .chain = arm_command_handlers,
+       },
+       {
+               .chain = armv7a_command_handlers,
+       },
+       {
+               .name = "cortex_a8",
+               .mode = COMMAND_ANY,
+               .help = "Cortex-A8 command group",
+               .chain = cortex_a8_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct target_type cortexa8_target = {
        .name = "cortex_a8",
@@ -1681,7 +1711,7 @@ struct target_type cortexa8_target = {
        .add_watchpoint = NULL,
        .remove_watchpoint = NULL,
 
-       .register_commands = cortex_a8_register_commands,
+       .commands = cortex_a8_command_handlers,
        .target_create = cortex_a8_target_create,
        .init_target = cortex_a8_init_target,
        .examine = cortex_a8_examine,