[Openocd-svn] r1561 - trunk/src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-04-29 04:18:50 +0200 (Wed, 29 Apr 2009)
New Revision: 1561

Modified:
   trunk/src/jtag/jlink.c
Log:
Fix jlink for Debian/Ubuntu (by Ben Dooks <ben...@fl...>).

Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c	2009-04-29 01:43:01 UTC (rev 1560)
+++ trunk/src/jtag/jlink.c	2009-04-29 02:18:50 UTC (rev 1561)
@@ -886,12 +886,21 @@
 	}
 	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)
 {