move "reset_config" out of JTAG command group

[openocd.git] / src / jtag / tcl.c

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 3ffa930d0bde08593adfdb14964a7e25b9052e6e..90081cdcc6e82c8e38124367b887b6547cb175c0 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1291,7 +1291,7 @@ next:
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
+COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
 {
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1302,7 +1302,7 @@ COMMAND_HANDLER(handle_jtag_nsrst_delay_command)
 
                jtag_set_nsrst_delay(delay);
        }
-       command_print(CMD_CTX, "jtag_nsrst_delay: %u", jtag_get_nsrst_delay());
+       command_print(CMD_CTX, "adapter_nsrst_delay: %u", jtag_get_nsrst_delay());
        return ERROR_OK;
 }
 
@@ -1321,7 +1321,7 @@ COMMAND_HANDLER(handle_jtag_ntrst_delay_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
+COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command)
 {
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1332,7 +1332,7 @@ COMMAND_HANDLER(handle_jtag_nsrst_assert_width_command)
 
                jtag_set_nsrst_assert_width(delay);
        }
-       command_print(CMD_CTX, "jtag_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
+       command_print(CMD_CTX, "adapter_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
        return ERROR_OK;
 }
 
@@ -1351,7 +1351,7 @@ COMMAND_HANDLER(handle_jtag_ntrst_assert_width_command)
        return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_jtag_khz_command)
+COMMAND_HANDLER(handle_adapter_khz_command)
 {
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1430,7 +1430,7 @@ COMMAND_HANDLER(handle_jtag_reset_command)
        else
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (jtag_interface_init(CMD_CTX) != ERROR_OK)
+       if (adapter_init(CMD_CTX) != ERROR_OK)
                return ERROR_JTAG_INIT_FAILED;
 
        jtag_add_reset(trst, srst);
@@ -1608,6 +1608,30 @@ COMMAND_HANDLER(handle_tms_sequence_command)
 }
 
 static const struct command_registration interface_command_handlers[] = {
+       {
+               .name = "adapter_khz",
+               .handler = handle_adapter_khz_command,
+               .mode = COMMAND_ANY,
+               .help = "With an argument, change to the specified maximum "
+                       "jtag speed.  For JTAG, 0 KHz signifies adaptive "
+                       " clocking. "
+                       "With or without argument, display current setting.",
+               .usage = "[khz]",
+       },
+       {
+               .name = "adapter_nsrst_assert_width",
+               .handler = handle_adapter_nsrst_assert_width_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after asserting SRST in ms",
+               .usage = "[milliseconds]",
+       },
+       {
+               .name = "adapter_nsrst_delay",
+               .handler = handle_adapter_nsrst_delay_command,
+               .mode = COMMAND_ANY,
+               .help = "delay after deasserting SRST in ms",
+               .usage = "[milliseconds]",
+       },
        {
                .name = "interface",
                .handler = handle_interface_command,
@@ -1621,6 +1645,17 @@ static const struct command_registration interface_command_handlers[] = {
                .mode = COMMAND_ANY,
                .help = "List all built-in debug adapter interfaces (drivers)",
        },
+       {
+               .name = "reset_config",
+               .handler = handle_reset_config_command,
+               .mode = COMMAND_ANY,
+               .help = "configure adapter reset behavior",
+               .usage = "[none|trst_only|srst_only|trst_and_srst] "
+                       "[srst_pulls_trst|trst_pulls_srst|combined|separate] "
+                       "[srst_gates_jtag|srst_nogate] "
+                       "[trst_push_pull|trst_open_drain] "
+                       "[srst_push_pull|srst_open_drain]",
+       },
        COMMAND_REGISTRATION_DONE
 };
 
@@ -1636,15 +1671,6 @@ int interface_register_commands(struct command_context *ctx)
 }
 
 static const struct command_registration jtag_command_handlers[] = {
-       {
-               .name = "jtag_khz",
-               .handler = handle_jtag_khz_command,
-               .mode = COMMAND_ANY,
-               .help = "With an argument, change to the specified maximum "
-                       "jtag speed.  Pass 0 to require adaptive clocking. "
-                       "With or without argument, display current setting.",
-               .usage = "[khz]",
-       },
        {
                .name = "jtag_rclk",
                .handler = handle_jtag_rclk_command,
@@ -1654,24 +1680,6 @@ static const struct command_registration jtag_command_handlers[] = {
                        "With or without argument, display current setting.",
                .usage = "[fallback_speed_khz]",
        },
-       {
-               .name = "reset_config",
-               .handler = handle_reset_config_command,
-               .mode = COMMAND_ANY,
-               .help = "configure JTAG reset behavior",
-               .usage = "[none|trst_only|srst_only|trst_and_srst] "
-                       "[srst_pulls_trst|trst_pulls_srst|combined|separate] "
-                       "[srst_gates_jtag|srst_nogate] "
-                       "[trst_push_pull|trst_open_drain] "
-                       "[srst_push_pull|srst_open_drain]",
-       },
-       {
-               .name = "jtag_nsrst_delay",
-               .handler = handle_jtag_nsrst_delay_command,
-               .mode = COMMAND_ANY,
-               .help = "delay after deasserting srst in ms",
-               .usage = "[milliseconds]",
-       },
        {
                .name = "jtag_ntrst_delay",
                .handler = handle_jtag_ntrst_delay_command,
@@ -1679,13 +1687,6 @@ static const struct command_registration jtag_command_handlers[] = {
                .help = "delay after deasserting trst in ms",
                .usage = "[milliseconds]",
        },
-       {
-               .name = "jtag_nsrst_assert_width",
-               .handler = handle_jtag_nsrst_assert_width_command,
-               .mode = COMMAND_ANY,
-               .help = "delay after asserting srst in ms",
-               .usage = "[milliseconds]",
-       },
        {
                .name = "jtag_ntrst_assert_width",
                .handler = handle_jtag_ntrst_assert_width_command,