diff options
author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-19 13:58:15 +0000 |
---|---|---|
committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-19 13:58:15 +0000 |
commit | 9d1f95e01a4d273bd0e82a98719a4ea5ff435647 (patch) | |
tree | c860d08155ef6c3b4c6808dccc8d671a1f749758 /src/jtag/rlink/rlink.c | |
parent | e2c2b2d926e7827e4177d4c760ca76f22ab49241 (diff) |
- fix rlink build under native win32 (mingw)
- remove rlink build warnings
- add usb_set_configuration to rlink_init, win32 requires this
- add win32 ETIMEDOUT define
git-svn-id: svn://svn.berlios.de/openocd/trunk@1260 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/rlink/rlink.c')
-rw-r--r-- | src/jtag/rlink/rlink.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index 911cefe7..dc75bdef 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -31,6 +31,7 @@ #include <errno.h> #include <string.h> #include <usb.h> +#include <stdint.h> /* project specific includes */ #include "log.h" @@ -1034,7 +1035,6 @@ rlink_scan( int tdi_bit_offset; u8 tdi_mask, *tdi_p; u8 dtc_mask; - dtc_reply_queue_entry_t *rq_entry; if(scan_size < 1) { LOG_ERROR("scan_size cannot be less than 1 bit\n"); @@ -1555,7 +1555,7 @@ int rlink_init(void) { struct usb_bus *busses; struct usb_bus *bus; - int c, i, a, j, retries,len; + int i, j, retries; int found=0; int success=0; u8 reply_buffer[USB_EP1IN_SIZE]; @@ -1597,6 +1597,9 @@ int rlink_init(void) { LOG_DEBUG("Opened device, pHDev = %p\n",pHDev); + /* usb_set_configuration required under win32 */ + usb_set_configuration(pHDev, dev->config[0].bConfigurationValue); + retries = 3; do { |