X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=0bffd43a08e9f6af542894a8a78221e3228bac98;hb=115f82939661da6ad2d26d5ceca709bbc0ad25b5;hp=0d688300b0f810a4c82494ac597e96ba8b14dd6c;hpb=ca070ed9a0237e5cea10e5dd974e06da62de890d;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c
index 0d688300..0bffd43a 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Sven Peter <sven@fail0verflow.com>
  * Copyright (C) 2010 Haxx Enterprises <bushing@gmail.com>
@@ -29,11 +29,12 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <libusb.h>
 #include <stdio.h>
-#include "sigrok.h"
-#include "sigrok-internal.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)
@@ -50,8 +51,6 @@ enum {
 	REQ_WRITEDATA,
 };
 
-static struct libusb_device_handle *g_devh = NULL;
-
 static int gl_write_address(libusb_device_handle *devh, unsigned int address)
 {
 	unsigned char packet[8] = { address & 0xFF };
@@ -60,8 +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("%s: libusb_control_transfer returned %d\n",
-		       __func__, ret);
+		sr_err("%s: %s.", __func__, libusb_error_name(ret));
 	return ret;
 }
 
@@ -73,8 +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("%s: libusb_control_transfer returned %d\n",
-		       __func__, ret);
+		sr_err("%s: %s.", __func__, libusb_error_name(ret));
 	return ret;
 }
 
@@ -86,8 +83,8 @@ 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("%s: libusb_control_transfer returned %d, val=%hhx\n",
-		       __func__, ret, packet[0]);
+		sr_err("%s: %s, val=%hhx.", __func__,
+		       libusb_error_name(ret), packet[0]);
 	return (ret == 1) ? packet[0] : ret;
 }
 
@@ -102,13 +99,14 @@ 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("%s: libusb_control_transfer returned %d\n",
-		       __func__, ret);
+		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("Bulk read error %d\n", ret);
+		sr_err("%s: libusb_bulk_transfer: %s.", __func__,
+		       libusb_error_name(ret));
 	return transferred;
 }