sr: Mark API functions with SR_API/SR_PRIV.

[libsigrok.git] / hardware / zeroplus-logic-cube / gl_usb.c

diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c
index b371ba5979c8afe1d6292febbd9cc2f28b83ad0d..7353f65db0bc252ec4cab0aa1d88808b8ce44208 100644 (file)
--- a/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/hardware/zeroplus-logic-cube/gl_usb.c
@@ -31,6 +31,8 @@
 
 #include <libusb.h>
 #include <stdio.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 #include "gl_usb.h"
 
 #define CTRL_IN                (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \
@@ -65,8 +67,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 +80,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 +93,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 +108,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;
 }