command_handler: change 'cmd_ctx' to CMD_CTX

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

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index abfaadc95a77393e158010e3b2744e1ff974992d..4da2fa1ffafe9f7c368400e0a561a600dfcc6b2b 100644 (file)
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -289,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;
@@ -495,16 +495,15 @@ 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)
                {
                        uint16_t port;
-                       COMMAND_PARSE_NUMBER(u16, args[0], port);
+                       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], port);
                        amt_jtagaccel_port = port;
                }
                else
@@ -514,21 +513,21 @@ static int amt_jtagaccel_handle_parport_port_command(
                }
        }
 
-       command_print(cmd_ctx, "parport port = %u", amt_jtagaccel_port);
+       command_print(CMD_CTX, "parport port = %u", amt_jtagaccel_port);
 
        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");
+               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;
                }
@@ -541,7 +540,7 @@ 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_s *cmd_ctx)
+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,
@@ -553,7 +552,7 @@ static int amt_jtagaccel_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-jtag_interface_t amt_jtagaccel_interface = {
+struct jtag_interface amt_jtagaccel_interface = {
                .name = "amt_jtagaccel",
                .register_commands = &amt_jtagaccel_register_commands,
                .init = &amt_jtagaccel_init,