X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=5fa7fd22182aaf29c290799b55374beaa301c111;hb=488a13b110d3563194dd63e087e295a4aa114002;hp=29a7a7b164ac5ca90c482886782b5e1acdce56f1;hpb=fed16f06e236f3f2ccc25a63ca7ec7a020124fdc;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c
index 29a7a7b1..5fa7fd22 100644
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,6 +31,7 @@
 
 #include <libusb.h>
 #include <stdio.h>
+#include <sigrok-internal.h>
 #include "gl_usb.h"
 
 #define CTRL_IN		(LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
@@ -65,8 +66,8 @@ 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)
-		printf("%s: libusb_control_transfer returned %d\n",
-		       __FUNCTION__, ret);
+		sr_err("%s: libusb_control_transfer returned %d\n",
+		       __func__, ret);
 	return ret;
 }
 
@@ -78,8 +79,8 @@ 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)
-		printf("%s: libusb_control_transfer returned %d\n",
-		       __FUNCTION__, ret);
+		sr_err("%s: libusb_control_transfer returned %d\n",
+		       __func__, ret);
 	return ret;
 }
 
@@ -91,8 +92,8 @@ 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)
-		printf("%s: libusb_control_transfer returned %d, val=%hhx\n",
-		       __FUNCTION__, ret, packet[0]);
+		sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n",
+		       __func__, ret, packet[0]);
 	return (ret == 1) ? packet[0] : ret;
 }
 
@@ -106,13 +107,13 @@ int gl_read_bulk(libusb_device_handle *devh, void *buffer, unsigned int size)
 	ret = libusb_control_transfer(devh, CTRL_OUT, 0x4, REQ_READBULK,
 				      0, packet, 8, TIMEOUT);
 	if (ret != 8)
-		printf("%s: libusb_control_transfer returned %d\n",
-		       __FUNCTION__, ret);
+		sr_err("%s: libusb_control_transfer returned %d\n",
+		       __func__, ret);
 
 	ret = libusb_bulk_transfer(devh, ENDPOINT_BULK_IN, buffer, size,
 				   &transferred, TIMEOUT);
 	if (ret < 0)
-		fprintf(stderr, "Bulk read error %d\n", ret);
+		sr_err("Bulk read error %d\n", ret);
 	return transferred;
 }
 
@@ -151,8 +152,6 @@ int gl_open(int vid)
 	if (ret < 0)
 		return GL_ELIBUSB;
 
-	libusb_set_debug(NULL, 0);
-
 	if (libusb_get_device_list(NULL, &devs) < 0) {
 		ret = GL_EOPEN;
 		goto gl_open_error;