diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-29 02:18:50 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-04-29 02:18:50 +0000 |
| commit | a8f1307992277a0ef53819583dad7ad444e29043 (patch) | |
| tree | 35dd0bcd8e4a7dd218a679110f2b46e963d46b7d | |
| parent | 1de959ca1c9e67ef57f77ec2d7a1132b73153abb (diff) | |
| download | openocd_libswd-a8f1307992277a0ef53819583dad7ad444e29043.tar.gz openocd_libswd-a8f1307992277a0ef53819583dad7ad444e29043.tar.bz2 openocd_libswd-a8f1307992277a0ef53819583dad7ad444e29043.tar.xz openocd_libswd-a8f1307992277a0ef53819583dad7ad444e29043.zip | |
Fix jlink for Debian/Ubuntu (by Ben Dooks <ben-openocd@fluff.org>).
git-svn-id: svn://svn.berlios.de/openocd/trunk@1561 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/jtag/jlink.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index 028a36cf..6665c7e3 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -886,12 +886,21 @@ static int usb_bulk_with_retries( } return rc; } + +static int wrap_usb_bulk_write(usb_dev_handle *dev, int ep, + char *buff, int size, int timeout) +{ + /* usb_bulk_write() takes const char *buff */ + return usb_bulk_write(dev, ep, buff, size, timeout); +} + static inline int usb_bulk_write_ex(usb_dev_handle *dev, int ep, char *bytes, int size, int timeout) { - return usb_bulk_with_retries(&usb_bulk_write, + return usb_bulk_with_retries(&wrap_usb_bulk_write, dev, ep, bytes, size, timeout); } + static inline int usb_bulk_read_ex(usb_dev_handle *dev, int ep, char *bytes, int size, int timeout) { |