X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Ftcl.c;h=8faefd1a93f5d5b90ba341258c9171c373045ef4;hb=96f9790279f74f39b35fc3ad09340fd03123180c;hp=3ffa930d0bde08593adfdb14964a7e25b9052e6e;hpb=591e0bbab957e86c8b2c6e19420a8cd9f89993cd;p=openocd.git

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 3ffa930d0b..8faefd1a93 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -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,16 @@ 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 = "interface",
 		.handler = handle_interface_command,
@@ -1636,15 +1646,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,