jtag: rename JTAG_MOVESTATE to JTAG_TLR_RESET

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

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index de84fbd7073d757b58ee0a44dadf6d12b2ef536d..cc7855564968c21d8539a613963153d19a32b5c1 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #endif
 
-#include "interface.h"
+#include <jtag/interface.h>
 #include <jtag/commands.h>
 #include "usb_common.h"
 
@@ -131,7 +131,7 @@ static int usbprog_execute_queue(void)
                                usbprog_end_state(cmd->cmd.runtest->end_state);
                                usbprog_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
@@ -652,9 +652,10 @@ static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag)
 }
 
 struct jtag_interface usbprog_interface = {
-               .name = "usbprog",
-               .execute_queue = &usbprog_execute_queue,
-               .speed = &usbprog_speed,
-               .init = &usbprog_init,
-               .quit = &usbprog_quit
-       };
+       .name = "usbprog",
+
+       .execute_queue = usbprog_execute_queue,
+       .speed = usbprog_speed,
+       .init = usbprog_init,
+       .quit = usbprog_quit
+};