move nor drivers to src/flash/nor

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

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index 3fb77f8eb0d0766c56279010cdf6041d43a5c7a9..d26482a6136703d55b718bbe1f1342ce336882b2 100644 (file)
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -497,13 +497,13 @@ static int amt_jtagaccel_quit(void)
 
 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
@@ -513,21 +513,21 @@ COMMAND_HANDLER(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;
 }
 
 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;
                }
@@ -540,21 +540,27 @@ COMMAND_HANDLER(amt_jtagaccel_handle_rtck_command)
        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;
-}
+static const struct command_registration amtjtagaccel_command_handlers[] = {
+       {
+               .name = "parport_port",
+               .handler = &amt_jtagaccel_handle_parport_port_command,
+               .mode = COMMAND_CONFIG,
+               .help = "configure the parallel port to use",
+               .usage = "<port_num>",
+       },
+       {
+               .name = "parport_port",
+               .handler = &amt_jtagaccel_handle_rtck_command,
+               .mode = COMMAND_CONFIG,
+               .help = "enable RTCK",
+               .usage = "<enable|disable>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 struct jtag_interface amt_jtagaccel_interface = {
                .name = "amt_jtagaccel",
-               .register_commands = &amt_jtagaccel_register_commands,
+               .commands = amtjtagaccel_command_handlers,
                .init = &amt_jtagaccel_init,
                .quit = &amt_jtagaccel_quit,
                .speed = &amt_jtagaccel_speed,