ecos: add 64 bit types for sprintf/sscanf

[openocd.git] / src / jtag / drivers / gw16012.c

diff --git a/src/jtag/drivers/gw16012.c b/src/jtag/drivers/gw16012.c
index 9083e925f074a4a999c06385bc6b92a2143f2b9c..172929943c9d8c5dda14f168cf3a7359f1ea9c64 100644 (file)
--- a/src/jtag/drivers/gw16012.c
+++ b/src/jtag/drivers/gw16012.c
@@ -344,7 +344,7 @@ static int gw16012_execute_queue(void)
                                gw16012_end_state(cmd->cmd.runtest->end_state);
                                gw16012_runtest(cmd->cmd.runtest->num_cycles);
                                break;
-                       case JTAG_STATEMOVE:
+                       case JTAG_TLR_RESET:
 #ifdef _DEBUG_JTAG_IO_
                                LOG_DEBUG("statemove end in %i", cmd->cmd.statemove->end_state);
 #endif
@@ -529,7 +529,11 @@ static int gw16012_init(void)
        gw16012_input(&status_port);
        gw16012_msb = (status_port & 0x80) ^ 0x80;
 
-       gw16012_speed(jtag_get_speed());
+       int jtag_speed_var;
+       int retval = jtag_get_speed(&jtag_speed_var);
+       if (retval != ERROR_OK)
+               return retval;
+       gw16012_speed(jtag_speed_var);
        gw16012_reset(0, 0);
 
        return ERROR_OK;
@@ -565,19 +569,22 @@ COMMAND_HANDLER(gw16012_handle_parport_port_command)
 static const struct command_registration gw16012_command_handlers[] = {
        {
                .name = "parport_port",
-               .handler = &gw16012_handle_parport_port_command,
+               .handler = gw16012_handle_parport_port_command,
                .mode = COMMAND_CONFIG,
-               .help = "configure the parallel port to use",
-               .usage = "<port_num>",
+               .help = "Display the address of the I/O port (e.g. 0x378) "
+                       "or the number of the '/dev/parport' device used.  "
+                       "If a parameter is provided, first change that port.",
+               .usage = "[port_number]",
        },
        COMMAND_REGISTRATION_DONE
 };
 
 struct jtag_interface gw16012_interface = {
-               .name = "gw16012",
-               .commands = gw16012_command_handlers,
-               .init = &gw16012_init,
-               .quit = &gw16012_quit,
-               .speed = &gw16012_speed,
-               .execute_queue = &gw16012_execute_queue,
-       };
+       .name = "gw16012",
+       .commands = gw16012_command_handlers,
+
+       .init = gw16012_init,
+       .quit = gw16012_quit,
+       .speed = gw16012_speed,
+       .execute_queue = gw16012_execute_queue,
+};