X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=944882a6262b389ceaafe6366a1853177868795c;hb=6d1161142dfce461c8e54c09d821443c68916df8;hp=cd7d97a81f043fd62594a5b8f90e42f2b524dc7b;hpb=c4227fc637431113ba92092ddbda86461703c06c;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c
index cd7d97a8..944882a6 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -29,11 +29,12 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <libusb.h>
 #include <stdio.h>
+#include <libusb.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "gl_usb.h"
+#include "protocol.h"
 
 #define CTRL_IN		(LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
 			 LIBUSB_RECIPIENT_INTERFACE)
@@ -58,7 +59,7 @@ static int gl_write_address(libusb_device_handle *devh, unsigned int address)
 	ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEADDR,
 					 0, packet, 1, TIMEOUT);
 	if (ret != 1)
-		sr_err("zp: %s: %s.", __func__, libusb_error_name(ret));
+		sr_err("%s: %s.", __func__, libusb_error_name(ret));
 	return ret;
 }
 
@@ -70,7 +71,7 @@ static int gl_write_data(libusb_device_handle *devh, unsigned int val)
 	ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEDATA,
 				      0, packet, 1, TIMEOUT);
 	if (ret != 1)
-		sr_err("zp: %s: %s.", __func__, libusb_error_name(ret));
+		sr_err("%s: %s.", __func__, libusb_error_name(ret));
 	return ret;
 }
 
@@ -82,7 +83,7 @@ static int gl_read_data(libusb_device_handle *devh)
 	ret = libusb_control_transfer(devh, CTRL_IN, 0xc, REQ_READDATA,
 				      0, packet, 1, TIMEOUT);
 	if (ret != 1)
-		sr_err("zp: %s: %s, val=%hhx.", __func__,
+		sr_err("%s: %s, val=%hhx.", __func__,
 		       libusb_error_name(ret), packet[0]);
 	return (ret == 1) ? packet[0] : ret;
 }
@@ -98,13 +99,13 @@ SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
 	ret = libusb_control_transfer(devh, CTRL_OUT, 0x4, REQ_READBULK,
 				      0, packet, 8, TIMEOUT);
 	if (ret != 8)
-		sr_err("zp: %s: libusb_control_transfer: %s.", __func__,
+		sr_err("%s: libusb_control_transfer: %s.", __func__,
 		       libusb_error_name(ret));
 
 	ret = libusb_bulk_transfer(devh, EP1_BULK_IN, buffer, size,
 				   &transferred, TIMEOUT);
 	if (ret < 0)
-		sr_err("zp: %s: libusb_bulk_transfer: %s.", __func__,
+		sr_err("%s: libusb_bulk_transfer: %s.", __func__,
 		       libusb_error_name(ret));
 	return transferred;
 }