allow jtag interfaces to lack commands

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

diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index a18b3f6afc1f5419f760bcafeea1d29f8d4a1994..b80626f57d5dcd518f85830303ab83a95a368052 100644 (file)
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -59,8 +59,7 @@
 
 /* parallel port cable description
  */
-typedef struct cable_s
-{
+struct cable {
        char* name;
        uint8_t TDO_MASK;       /* status port bit containing current TDO value */
        uint8_t TRST_MASK;      /* data port bit for TRST */
@@ -73,9 +72,9 @@ typedef struct cable_s
        uint8_t PORT_INIT;      /* initialize data port with this value */
        uint8_t PORT_EXIT;      /* de-initialize data port with this value */
        uint8_t LED_MASK;       /* data port bit for LED */
-} cable_t;
+};
 
-static cable_t cables[] =
+static struct cable cables[] =
 {
        /* name                                 tdo   trst  tms   tck   tdi   srst  o_inv i_inv init  exit  led */
        { "wiggler",                    0x80, 0x10, 0x02, 0x04, 0x08, 0x01, 0x01, 0x80, 0x80, 0x80, 0x00 },
@@ -104,13 +103,13 @@ static cable_t 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;
 
 /* interface variables
  */
-static cable_t* cable;
+static struct cable* cable;
 static uint8_t dataport_value = 0x0;
 
 #if PARPORT_USE_PPDEV == 1
@@ -255,7 +254,7 @@ static int parport_get_giveio_access(void)
 }
 #endif
 
-static bitbang_interface_t parport_bitbang = {
+static struct bitbang_interface parport_bitbang = {
                .read = &parport_read,
                .write = &parport_write,
                .reset = &parport_reset,
@@ -264,7 +263,7 @@ static bitbang_interface_t parport_bitbang = {
 
 static int parport_init(void)
 {
-       cable_t *cur_cable;
+       struct cable *cur_cable;
 #if PARPORT_USE_PPDEV == 1
        char buffer[256];
        int i = 0;
@@ -412,12 +411,12 @@ static int parport_quit(void)
 
 COMMAND_HANDLER(parport_handle_parport_port_command)
 {
-       if (argc == 1)
+       if (CMD_ARGC == 1)
        {
                /* 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
                {
@@ -426,21 +425,21 @@ 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;
 }
 
 COMMAND_HANDLER(parport_handle_parport_cable_command)
 {
-       if (argc == 0)
+       if (CMD_ARGC == 0)
                return ERROR_OK;
 
        /* 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;
@@ -448,25 +447,22 @@ COMMAND_HANDLER(parport_handle_parport_cable_command)
 
 COMMAND_HANDLER(parport_handle_write_on_exit_command)
 {
-       if (argc != 1)
+       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;
 }
 
 COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
 {
-       if (argc == 1) {
+       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;
@@ -480,13 +476,13 @@ 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_s *cmd_ctx)
+static int parport_register_commands(struct command_context *cmd_ctx)
 {
        register_command(cmd_ctx, NULL, "parport_port",
                        parport_handle_parport_port_command, COMMAND_CONFIG,
@@ -510,7 +506,7 @@ static int parport_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-jtag_interface_t parport_interface = {
+struct jtag_interface parport_interface = {
        .name =                 "parport",
        .register_commands =    parport_register_commands,
        .init =                 parport_init,