X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=6b894da91cd994d0601412d535e2079f97771f2f;hb=e82d7dbc202794dc30abdb4e50cfb4507f49025e;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..6b894da9 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,8 +31,8 @@
 
 #include <libusb.h>
 #include <stdio.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "gl_usb.h"
 
 #define CTRL_IN		(LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
@@ -50,8 +50,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,7 +58,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",
+		sr_err("zp: %s: libusb_control_transfer returned %d.",
 		       __func__, ret);
 	return ret;
 }
@@ -73,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("%s: libusb_control_transfer returned %d\n",
+		sr_err("zp: %s: libusb_control_transfer returned %d.",
 		       __func__, ret);
 	return ret;
 }
@@ -86,8 +84,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("zp: %s: libusb_control_transfer returned %d, "
+		       "val=%hhx.", __func__, ret, packet[0]);
 	return (ret == 1) ? packet[0] : ret;
 }
 
@@ -102,13 +100,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("%s: libusb_control_transfer returned %d\n",
+		sr_err("zp: %s: libusb_control_transfer returned %d.",
 		       __func__, 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("zp: Bulk read error %d.", ret);
 	return transferred;
 }