X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fgl_usb.c;h=3ba083264f44615abdae4d5c63566e61c9c98de5;hb=f020a99773d1431ee58090e9515dc19b10e7463f;hp=c84e61c4c980d911223ce43e9b0632cd7c568b3e;hpb=a562c3a2e5e54dbb7e0553422ac0e0c845b180ad;p=libsigrok.git diff --git a/hardware/zeroplus-logic-cube/gl_usb.c b/hardware/zeroplus-logic-cube/gl_usb.c index c84e61c4..3ba08326 100644 --- a/hardware/zeroplus-logic-cube/gl_usb.c +++ b/hardware/zeroplus-logic-cube/gl_usb.c @@ -31,6 +31,7 @@ #include #include +#include "sigrok-internal.h" #include "gl_usb.h" #define CTRL_IN (LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN | \ @@ -66,7 +67,7 @@ int gl_write_address(libusb_device_handle *devh, unsigned int address) 0, packet, 1, TIMEOUT); if (ret != 1) sr_err("%s: libusb_control_transfer returned %d\n", - __FUNCTION__, ret); + __func__, ret); return ret; } @@ -79,7 +80,7 @@ int gl_write_data(libusb_device_handle *devh, unsigned int val) 0, packet, 1, TIMEOUT); if (ret != 1) sr_err("%s: libusb_control_transfer returned %d\n", - __FUNCTION__, ret); + __func__, ret); return ret; } @@ -92,7 +93,7 @@ int gl_read_data(libusb_device_handle *devh) 0, packet, 1, TIMEOUT); if (ret != 1) sr_err("%s: libusb_control_transfer returned %d, val=%hhx\n", - __FUNCTION__, ret, packet[0]); + __func__, ret, packet[0]); return (ret == 1) ? packet[0] : ret; } @@ -107,7 +108,7 @@ int gl_read_bulk(libusb_device_handle *devh, void *buffer, unsigned int size) 0, packet, 8, TIMEOUT); if (ret != 8) sr_err("%s: libusb_control_transfer returned %d\n", - __FUNCTION__, ret); + __func__, ret); ret = libusb_bulk_transfer(devh, ENDPOINT_BULK_IN, buffer, size, &transferred, TIMEOUT);