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

[<oh...@ma...>]

Author: oharboe
Date: 2009-04-19 10:15:32 +0200 (Sun, 19 Apr 2009)
New Revision: 1465

Modified:
   trunk/src/jtag/usbprog.c
Log:
Zach Welch <zw...@su...>  fix warnings in usbprog

Modified: trunk/src/jtag/usbprog.c
===================================================================
--- trunk/src/jtag/usbprog.c	2009-04-19 08:05:54 UTC (rev 1464)
+++ trunk/src/jtag/usbprog.c	2009-04-19 08:15:32 UTC (rev 1465)
@@ -347,18 +347,16 @@
 
 	usbprog_jtag_tms_send(usbprog_jtag_handle);
 
-	if (type == SCAN_OUT)
-	{
-		usbprog_jtag_write_tdi(usbprog_jtag_handle,buffer, scan_size);
+	void (*f)(struct usbprog_jtag *usbprog_jtag, char * buffer, int size);
+	switch (type) {
+	case SCAN_OUT: f = &usbprog_jtag_write_tdi; break;
+	case SCAN_IN: f = &usbprog_jtag_read_tdo; break;
+	case SCAN_IO: f = &usbprog_jtag_write_and_read; break;
+	default:
+		LOG_ERROR("unknown scan type: %i", type);
+		exit(-1);
 	}
-	if (type == SCAN_IN)
-	{
-		usbprog_jtag_read_tdo(usbprog_jtag_handle,buffer, scan_size);
-	}
-	if (type == SCAN_IO)
-	{
-		usbprog_jtag_write_and_read(usbprog_jtag_handle,buffer, scan_size);
-	}
+	f(usbprog_jtag_handle, (char *)buffer, scan_size);
 
 	if (ir_scan)
 		tap_set_state(TAP_IRPAUSE);