X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Famt_jtagaccel.c;h=d35b0c21b111466f4b7dc27b799ac2659fdac6db;hp=c8fcc54f93032191b110a4d62af9166147156dc5;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=d6a686c8521d0dab4f5a0f44f8fb6d49a43bea8b

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index c8fcc54f93..d35b0c21b1 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -72,15 +72,6 @@ static int data_mode = IEEE1284_MODE_EPP | IEEE1284_DATA ;
 
 #endif // PARPORT_USE_PPDEV
 
-static int amt_jtagaccel_execute_queue(void);
-static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx);
-static int amt_jtagaccel_speed(int speed);
-static int amt_jtagaccel_init(void);
-static int amt_jtagaccel_quit(void);
-
-static int amt_jtagaccel_handle_parport_port_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
 /* tap_move[i][j]: tap movement command to go from state i to state j
  * 0: Test-Logic-Reset
  * 1: Run-Test/Idle
@@ -101,28 +92,6 @@ static uint8_t amt_jtagaccel_tap_move[6][6][2] =
 };
 
 
-jtag_interface_t amt_jtagaccel_interface =
-{
-	.name = "amt_jtagaccel",
-
-	.execute_queue = amt_jtagaccel_execute_queue,
-
-	.speed = amt_jtagaccel_speed,
-	.register_commands = amt_jtagaccel_register_commands,
-	.init = amt_jtagaccel_init,
-	.quit = amt_jtagaccel_quit,
-};
-
-static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "parport_port", amt_jtagaccel_handle_parport_port_command,
-					 COMMAND_CONFIG, NULL);
-	register_command(cmd_ctx, NULL, "rtck", amt_jtagaccel_handle_rtck_command,
-					 COMMAND_CONFIG, NULL);
-
-	return ERROR_OK;
-}
-
 static void amt_jtagaccel_reset(int trst, int srst)
 {
 	if (trst == 1)
@@ -320,7 +289,7 @@ static void amt_jtagaccel_scan(bool ir_scan, enum scan_type type, uint8_t *buffe
 
 static int amt_jtagaccel_execute_queue(void)
 {
-	jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
+	struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
 	int scan_size;
 	enum scan_type type;
 	uint8_t *buffer;
@@ -374,7 +343,7 @@ static int amt_jtagaccel_execute_queue(void)
 				break;
 			case JTAG_SLEEP:
 #ifdef _DEBUG_JTAG_IO_
-				LOG_DEBUG("sleep %i", cmd->cmd.sleep->us);
+				LOG_DEBUG("sleep %" PRIi32, cmd->cmd.sleep->us);
 #endif
 				jtag_sleep(cmd->cmd.sleep->us);
 				break;
@@ -526,17 +495,16 @@ static int amt_jtagaccel_quit(void)
 	return ERROR_OK;
 }
 
-static int amt_jtagaccel_handle_parport_port_command(
-		struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(amt_jtagaccel_handle_parport_port_command)
 {
-	if (argc == 1)
+	if (CMD_ARGC == 1)
 	{
 		/* only if the port wasn't overwritten by cmdline */
 		if (amt_jtagaccel_port == 0)
 		{
-			int retval = parse_u16(args[0], &amt_jtagaccel_port);
-			if (ERROR_OK != retval)
-				return retval;
+			uint16_t port;
+			COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], port);
+			amt_jtagaccel_port = port;
 		}
 		else
 		{
@@ -550,16 +518,16 @@ static int amt_jtagaccel_handle_parport_port_command(
 	return ERROR_OK;
 }
 
-static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(amt_jtagaccel_handle_rtck_command)
 {
-	if (argc == 0)
+	if (CMD_ARGC == 0)
 	{
 		command_print(cmd_ctx, "amt_jtagaccel RTCK feature %s", (rtck_enabled) ? "enabled" : "disabled");
 		return ERROR_OK;
 	}
 	else
 	{
-		if (strcmp(args[0], "enabled") == 0)
+		if (strcmp(CMD_ARGV[0], "enabled") == 0)
 		{
 			rtck_enabled = 1;
 		}
@@ -571,3 +539,24 @@ static int amt_jtagaccel_handle_rtck_command(struct command_context_s *cmd_ctx,
 
 	return ERROR_OK;
 }
+
+static int amt_jtagaccel_register_commands(struct command_context *cmd_ctx)
+{
+	register_command(cmd_ctx, NULL, "parport_port",
+			amt_jtagaccel_handle_parport_port_command, COMMAND_CONFIG,
+			NULL);
+	register_command(cmd_ctx, NULL, "rtck",
+			amt_jtagaccel_handle_rtck_command, COMMAND_CONFIG,
+			NULL);
+
+	return ERROR_OK;
+}
+
+struct jtag_interface amt_jtagaccel_interface = {
+		.name = "amt_jtagaccel",
+		.register_commands = &amt_jtagaccel_register_commands,
+		.init = &amt_jtagaccel_init,
+		.quit = &amt_jtagaccel_quit,
+		.speed = &amt_jtagaccel_speed,
+		.execute_queue = &amt_jtagaccel_execute_queue,
+	};