scpi-pps: Add support for Owon P4000 series.

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

diff --git a/src/hardware/zeroplus-logic-cube/gl_usb.c b/src/hardware/zeroplus-logic-cube/gl_usb.c
index 20993286d275ffde471cebbe9809b4ef850c76f7..9899473f43d57281bc9ec91323005b6aece0b0d2 100644 (file)
--- a/src/hardware/zeroplus-logic-cube/gl_usb.c
+++ b/src/hardware/zeroplus-logic-cube/gl_usb.c
@@ -29,9 +29,10 @@
  *  THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "gl_usb.h"
 #include "protocol.h"
@@ -42,7 +43,7 @@
                         LIBUSB_RECIPIENT_INTERFACE)
 #define EP1_BULK_IN    (LIBUSB_ENDPOINT_IN | 1)
 
-#define TIMEOUT                5000    /* Timeout in ms */
+#define TIMEOUT_MS     (5 * 1000)
 
 enum {
        REQ_READBULK = 0x82,
@@ -57,7 +58,7 @@ static int gl_write_address(libusb_device_handle *devh, unsigned int address)
        int ret;
 
        ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEADDR,
-                                        0, packet, 1, TIMEOUT);
+                                        0, packet, 1, TIMEOUT_MS);
        if (ret != 1)
                sr_err("%s: %s.", __func__, libusb_error_name(ret));
        return ret;
@@ -69,7 +70,7 @@ static int gl_write_data(libusb_device_handle *devh, unsigned int val)
        int ret;
 
        ret = libusb_control_transfer(devh, CTRL_OUT, 0xc, REQ_WRITEDATA,
-                                     0, packet, 1, TIMEOUT);
+                                     0, packet, 1, TIMEOUT_MS);
        if (ret != 1)
                sr_err("%s: %s.", __func__, libusb_error_name(ret));
        return ret;
@@ -81,7 +82,7 @@ static int gl_read_data(libusb_device_handle *devh)
        int ret;
 
        ret = libusb_control_transfer(devh, CTRL_IN, 0xc, REQ_READDATA,
-                                     0, packet, 1, TIMEOUT);
+                                     0, packet, 1, TIMEOUT_MS);
        if (ret != 1)
                sr_err("%s: %s, val=%hhx.", __func__,
                       libusb_error_name(ret), packet[0]);
@@ -91,19 +92,20 @@ static int gl_read_data(libusb_device_handle *devh)
 SR_PRIV int gl_read_bulk(libusb_device_handle *devh, void *buffer,
                         unsigned int size)
 {
-       unsigned char packet[8] =
-           { 0, 0, 0, 0, size & 0xff, (size & 0xff00) >> 8,
-             (size & 0xff0000) >> 16, (size & 0xff000000) >> 24 };
+       unsigned char packet[8] = {
+               0, 0, 0, 0, size & 0xff, (size & 0xff00) >> 8,
+               (size & 0xff0000) >> 16, (size & 0xff000000) >> 24
+       };
        int ret, transferred = 0;
 
        ret = libusb_control_transfer(devh, CTRL_OUT, 0x4, REQ_READBULK,
-                                     0, packet, 8, TIMEOUT);
+                                     0, packet, 8, TIMEOUT_MS);
        if (ret != 8)
                sr_err("%s: libusb_control_transfer: %s.", __func__,
                       libusb_error_name(ret));
 
        ret = libusb_bulk_transfer(devh, EP1_BULK_IN, buffer, size,
-                                  &transferred, TIMEOUT);
+                                  &transferred, TIMEOUT_MS);
        if (ret < 0)
                sr_err("%s: libusb_bulk_transfer: %s.", __func__,
                       libusb_error_name(ret));