split jim_jtag_command into multiple handlers

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

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index 52289c5e0edcbbcc1978f974c9e709a7b0ddff8d..e5f56113f2473e01ef79ae95eff9ec945740f419 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -103,7 +103,7 @@ static struct cable cables[] =
 /* configuration */
 static char* parport_cable = NULL;
 static uint16_t parport_port;
-static int parport_exit = 0;
+static bool parport_exit = 0;
 static uint32_t parport_toggling_time_ns = 1000;
 static int wait_states;
 
@@ -416,7 +416,7 @@ COMMAND_HANDLER(parport_handle_parport_port_command)
                /* only if the port wasn't overwritten by cmdline */
                if (parport_port == 0)
                {
-                       COMMAND_PARSE_NUMBER(u16, args[0], parport_port);
+                       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port);
                }
                else
                {
@@ -425,7 +425,7 @@ COMMAND_HANDLER(parport_handle_parport_port_command)
                }
        }
 
-       command_print(cmd_ctx, "parport port = %u", parport_port);
+       command_print(CMD_CTX, "parport port = %u", parport_port);
 
        return ERROR_OK;
 }
@@ -438,8 +438,8 @@ COMMAND_HANDLER(parport_handle_parport_cable_command)
        /* only if the cable name wasn't overwritten by cmdline */
        if (parport_cable == 0)
        {
-               parport_cable = malloc(strlen(args[0]) + sizeof(char));
-               strcpy(parport_cable, args[0]);
+               parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
+               strcpy(parport_cable, CMD_ARGV[0]);
        }
 
        return ERROR_OK;
@@ -449,14 +449,11 @@ COMMAND_HANDLER(parport_handle_write_on_exit_command)
 {
        if (CMD_ARGC != 1)
        {
-               command_print(cmd_ctx, "usage: parport_write_on_exit <on | off>");
+               command_print(CMD_CTX, "usage: parport_write_on_exit <on | off>");
                return ERROR_OK;
        }
 
-       if (strcmp(args[0], "on") == 0)
-               parport_exit = 1;
-       else if (strcmp(args[0], "off") == 0)
-               parport_exit = 0;
+       COMMAND_PARSE_ON_OFF(CMD_ARGV[0], parport_exit);
 
        return ERROR_OK;
 }
@@ -465,7 +462,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 {
        if (CMD_ARGC == 1) {
                uint32_t ns;
-               int retval = parse_u32(args[0], &ns);
+               int retval = parse_u32(CMD_ARGV[0], &ns);
 
                if (ERROR_OK != retval)
                        return retval;
@@ -479,43 +476,58 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
                wait_states = jtag_get_speed();
        }
 
-       command_print(cmd_ctx, "parport toggling time = %" PRIu32 " ns",
+       command_print(CMD_CTX, "parport toggling time = %" PRIu32 " ns",
                        parport_toggling_time_ns);
 
        return ERROR_OK;
 }
 
-static int parport_register_commands(struct command_context *cmd_ctx)
-{
-       register_command(cmd_ctx, NULL, "parport_port",
-                       parport_handle_parport_port_command, COMMAND_CONFIG,
-                       "either the address of the I/O port "
-                       "or the number of the '/dev/parport' device");
+static const struct command_registration parport_command_handlers[] = {
+       {
+               .name = "parport_port",
+               .handler = &parport_handle_parport_port_command,
+               .mode = COMMAND_CONFIG,
+               .help = "either the address of the I/O port "
+                       "or the number of the '/dev/parport' device",
+               .usage = "[<port|devname>]",
+       },
+       {
+               .name = "parport_cable",
+               .handler = &parport_handle_parport_cable_command,
+               .mode = COMMAND_CONFIG,
+               .help = "the layout of the parallel port cable "
+                       "used to connect to the target",
+               .usage = "[<layout>]",
+       },
+       {
+               .name = "parport_write_on_exit",
+               .handler = &parport_handle_write_on_exit_command,
+               .mode = COMMAND_CONFIG,
+               .help = "configure the parallel driver to write "
+                       "a known value to the parallel interface",
+               .usage = "[<on|off>]",
+       },
+       {
+               .name = "parport_toggling_time",
+               .handler = &parport_handle_parport_toggling_time_command,
+               .mode = COMMAND_CONFIG,
+               .help = "time <ns> it takes for the hardware to toggle TCK",
+               .usage = "[<ns>]",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
-       register_command(cmd_ctx, NULL, "parport_cable",
-                       parport_handle_parport_cable_command, COMMAND_CONFIG,
-                       "the layout of the parallel port cable "
-                       "used to connect to the target");
+struct jtag_interface parport_interface = {
+               .name = "parport",
 
-       register_command(cmd_ctx, NULL, "parport_write_on_exit",
-                       parport_handle_write_on_exit_command, COMMAND_CONFIG,
-                       "configure the parallel driver to write "
-                       "a known value to the parallel interface");
+               .commands = parport_command_handlers,
 
-       register_command(cmd_ctx, NULL, "parport_toggling_time",
-                       parport_handle_parport_toggling_time_command, COMMAND_ANY,
-                       "time <ns> it takes for the hardware to toggle TCK");
+               .init = &parport_init,
+               .quit = &parport_quit,
 
-       return ERROR_OK;
-}
+               .khz = &parport_khz,
+               .speed_div = &parport_speed_div,
+               .speed = &parport_speed,
 
-struct jtag_interface parport_interface = {
-       .name =                 "parport",
-       .register_commands =    parport_register_commands,
-       .init =                 parport_init,
-       .quit =                 parport_quit,
-       .khz =                  parport_khz,
-       .speed_div =            parport_speed_div,
-       .speed =                parport_speed,
-       .execute_queue =        bitbang_execute_queue,
-};
+               .execute_queue = &bitbang_execute_queue,
+       };