[Openocd-svn] r2129 - trunk/src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-08 15:12:17 +0200 (Mon, 08 Jun 2009)
New Revision: 2129

Modified:
   trunk/src/jtag/jtag.c
Log:
Factor interface list to its own command:
- Add handle_interface_list_command, used by handle_interface_command.
- Display output of new list to command console.
- Change first index of displayed drivers to 1; it's only cosmetic.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-08 13:12:12 UTC (rev 2128)
+++ trunk/src/jtag/jtag.c	2009-06-08 13:12:17 UTC (rev 2129)
@@ -223,6 +223,8 @@
 int jtag_speed = 0;
 
 /* jtag commands */
+static int handle_interface_list_command(struct command_context_s *cmd_ctx,
+		char *cmd, char **args, int argc);
 static int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -1601,6 +1603,9 @@
 
 	register_command(cmd_ctx, NULL, "interface", handle_interface_command,
 		COMMAND_CONFIG, "try to configure interface");
+	register_command(cmd_ctx, NULL,
+		"interface_list", &handle_interface_list_command,
+		COMMAND_ANY, "list all built-in interfaces");
 	register_command(cmd_ctx, NULL, "jtag_speed", handle_jtag_speed_command,
 		COMMAND_ANY, "(DEPRECATED) set jtag speed (if supported)");
 	register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
@@ -1837,11 +1842,24 @@
 	 * didn't match one of the compiled-in interfaces
 	 */
 	LOG_ERROR("The specified JTAG interface was not found (%s)", args[0]);
-	LOG_ERROR("The following built-in JTAG interfaces are available:");
+	handle_interface_list_command(cmd_ctx, cmd, args, argc);
+	return ERROR_JTAG_INVALID_INTERFACE;
+}
+
+static int handle_interface_list_command(struct command_context_s *cmd_ctx,
+		char *cmd, char **args, int argc)
+{
+	if (strcmp(cmd, "interface_list") == 0 && argc > 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	command_print(cmd_ctx, "The following JTAG interfaces are available:");
 	for (unsigned i = 0; NULL != jtag_interfaces[i]; i++)
-		LOG_ERROR("%u: %s", i, jtag_interfaces[i]->name);
+	{
+		const char *name = jtag_interfaces[i]->name;
+		command_print(cmd_ctx, "%u: %s", i + 1, name);
+	}
 
-	return ERROR_JTAG_INVALID_INTERFACE;
+	return ERROR_OK;
 }
 
 static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)