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

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-04-21 11:41:41 +0200 (Tue, 21 Apr 2009)
New Revision: 1492

Modified:
   trunk/src/jtag/jlink.c
Log:
Zach Welch <zw...@su...>  factor jlink usb_bulk_*_ex functions

Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c	2009-04-21 09:08:43 UTC (rev 1491)
+++ trunk/src/jtag/jlink.c	2009-04-21 09:41:41 UTC (rev 1492)
@@ -859,15 +859,17 @@
 	}
 }
 
-static int usb_bulk_write_ex(usb_dev_handle *dev, int ep, char *bytes, int size,
-                      int timeout) {
-
+/* calls the given usb_bulk_* function, allowing for the data to trickle in with some timeouts  */
+static int usb_bulk_with_retries(
+		int (*f)(usb_dev_handle *, int, char *, int, int),
+		usb_dev_handle *dev, int ep,
+		char *bytes, int size, int timeout)
+{
 	int rc = 0, tries = 3, this_size;
 
 	while (tries && size) {
 
-		this_size = usb_bulk_write (dev, ep, bytes, size, timeout);
-
+		this_size = f(dev, ep, bytes, size, timeout);
 		if (this_size > 0) {
 			
 			size -= this_size;
@@ -877,36 +879,21 @@
 		} else
 			tries --;
 	}
-
 	return rc;
-
-
 }
-
-static int usb_bulk_read_ex(usb_dev_handle *dev, int ep, char *bytes, int size,
-                  int timeout) {
-
-	int rc = 0, tries = 3, this_size;
-
-	while (tries && size) {
-
-		this_size = usb_bulk_read (dev, ep, bytes, size, timeout);
-
-		if (this_size > 0) {
-			
-			size -= this_size;
-			rc += this_size;
-			bytes += this_size;
-
-		} else
-			tries --;
-	}
-
-	return rc;
-
+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,
+			dev, ep, bytes, size, timeout);
 }
+static inline int usb_bulk_read_ex(usb_dev_handle *dev, int ep,
+		char *bytes, int size, int timeout)
+{
+	return usb_bulk_with_retries(&usb_bulk_read,
+			dev, ep, bytes, size, timeout);
+}
 
-
 /* Write data from out_buffer to USB. */
 static int jlink_usb_write(jlink_jtag_t *jlink_jtag, int out_length)
 {