libusb: Fix build issues under cygwin/mingw

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

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 3b8a613032f000ae0aa355b723a395638c78a986..7d10d0f407023adf23ff57094396b0a3861090ff 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -317,7 +317,7 @@ static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
 
        usbprog_jtag_tms_send(usbprog_jtag_handle);
 
-       void (*f)(struct usbprog_jtag *usbprog_jtag, char * buffer, int size);
+       void (*f)(struct usbprog_jtag *usbprog_jtag, char * buffer_local, int size);
        switch (type) {
        case SCAN_OUT: f = &usbprog_jtag_write_tdi; break;
        case SCAN_IN: f = &usbprog_jtag_read_tdo; break;
@@ -454,7 +454,6 @@ static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char
                tmp[0] = WRITE_AND_READ;
                tmp[1] = (char)(send_bits >> 8);        /* high */
                tmp[2] = (char)(send_bits);                     /* low */
-               i = 0;
 
                for (i = 0; i < loops; i++)
                {
@@ -555,7 +554,6 @@ static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char * buf
                tmp[0] = WRITE_TDI;
                tmp[1] = (char)(send_bits >> 8);        /* high */
                tmp[2] = (char)(send_bits);                     /* low */
-               i = 0;
 
                for (i = 0; i < loops; i++)
                {