X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fjtag%2Fgw16012.c;h=b827fd53a12e543acf3f48c32a77c8e708674cb2;hb=fe9228a32db930be297d4d3b35ffb94d6de1b9ab;hp=07188f4e5cbd6ab26c91aa0c323e0d83f5775550;hpb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;p=fw%2Fopenocd

diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 07188f4e5..b827fd53a 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -183,7 +183,7 @@ static void gw16012_state_move(void)
 	tap_set_state(tap_get_end_state());
 }
 
-static void gw16012_path_move(pathmove_command_t *cmd)
+static void gw16012_path_move(struct pathmove_command *cmd)
 {
 	int num_states = cmd->num_states;
 	int state_count;
@@ -312,7 +312,7 @@ static void gw16012_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
 
 static int gw16012_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;
@@ -543,12 +543,12 @@ static int gw16012_quit(void)
 
 COMMAND_HANDLER(gw16012_handle_parport_port_command)
 {
-	if (argc == 1)
+	if (CMD_ARGC == 1)
 	{
 		/* only if the port wasn't overwritten by cmdline */
 		if (gw16012_port == 0)
 		{
-			COMMAND_PARSE_NUMBER(u16, args[0], gw16012_port);
+			COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], gw16012_port);
 		}
 		else
 		{
@@ -557,23 +557,25 @@ COMMAND_HANDLER(gw16012_handle_parport_port_command)
 		}
 	}
 
-	command_print(cmd_ctx, "parport port = %u", gw16012_port);
+	command_print(CMD_CTX, "parport port = %u", gw16012_port);
 
 	return ERROR_OK;
 }
 
-static int gw16012_register_commands(struct command_context_s *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "parport_port",
-			gw16012_handle_parport_port_command, COMMAND_CONFIG,
-			NULL);
-
-	return ERROR_OK;
-}
-
-jtag_interface_t gw16012_interface = {
+static const struct command_registration gw16012_command_handlers[] = {
+	{
+		.name = "parport_port",
+		.handler = &gw16012_handle_parport_port_command,
+		.mode = COMMAND_CONFIG,
+		.help = "configure the parallel port to use",
+		.usage = "<port_num>",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+struct jtag_interface gw16012_interface = {
 		.name = "gw16012",
-		.register_commands = &gw16012_register_commands,
+		.commands = gw16012_command_handlers,
 		.init = &gw16012_init,
 		.quit = &gw16012_quit,
 		.speed = &gw16012_speed,