jtag_command_t -> struct jtag_command

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

diff --git a/src/jtag/usbprog.c b/src/jtag/usbprog.c
index ed6472b28bc2bc7ec0bda802ea218f7ec92c07bf..7abb0ca330908081645cda0be67ca0e829c1ba73 100644 (file)
--- a/src/jtag/usbprog.c
+++ b/src/jtag/usbprog.c
@@ -57,11 +57,11 @@ static int usbprog_quit(void);
 
 static void usbprog_end_state(tap_state_t state);
 static void usbprog_state_move(void);
-static void usbprog_path_move(pathmove_command_t *cmd);
+static void usbprog_path_move(struct pathmove_command *cmd);
 static void usbprog_runtest(int num_cycles);
 static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int scan_size);
 
-jtag_interface_t usbprog_interface =
+struct jtag_interface usbprog_interface =
 {
        .name = "usbprog",
        .execute_queue = usbprog_execute_queue,
@@ -127,7 +127,7 @@ static int usbprog_register_commands(struct command_context_s *cmd_ctx)
 
 static int usbprog_execute_queue(void)
 {
-       jtag_command_t *cmd = jtag_command_queue; /* currently processed command */
+       struct jtag_command *cmd = jtag_command_queue; /* currently processed command */
        int scan_size;
        enum scan_type type;
        uint8_t *buffer;
@@ -249,7 +249,7 @@ static void usbprog_state_move(void)
        tap_set_state(tap_get_end_state());
 }
 
-static void usbprog_path_move(pathmove_command_t *cmd)
+static void usbprog_path_move(struct pathmove_command *cmd)
 {
        int num_states = cmd->num_states;
        int state_count;
@@ -370,14 +370,14 @@ static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
 
 static void usbprog_write(int tck, int tms, int tdi)
 {
-       unsigned char output_value=0x00;
+       unsigned char output_value = 0x00;
 
        if (tms)
-               output_value |= (1<<TMS_BIT);
+               output_value |= (1 << TMS_BIT);
        if (tdi)
-               output_value |= (1<<TDI_BIT);
+               output_value |= (1 << TDI_BIT);
        if (tck)
-               output_value |= (1<<TCK_BIT);
+               output_value |= (1 << TCK_BIT);
 
        usbprog_jtag_write_slice(usbprog_jtag_handle,output_value);
 }
@@ -435,6 +435,7 @@ struct usbprog_jtag* usbprog_jtag_open(void)
                        }
                }
        }
+       free(tmp);
        return 0;
 }
 
@@ -591,7 +592,7 @@ static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buf
                {
                        send_bits = size;
                        loops = size/8;
-                       /* if (loops==0) */
+                       /* if (loops == 0) */
                        loops++;
                        size = 0;
                }