fx2lafw: Use the USB_INTERFACE #define.

[libsigrok.git] / src / hardware / lascar-el-usb / api.c

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 3fe2f57b0c4d70028a4c888493927da855d54379..4d9ae81dfb4aa4fddab39c83eb16aa9386c22544 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -252,7 +252,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return SR_OK;
 }
 
-static void mark_xfer(struct libusb_transfer *xfer)
+static void LIBUSB_CALL mark_xfer(struct libusb_transfer *xfer)
 {
 
        if (xfer->status == LIBUSB_TRANSFER_COMPLETED)
@@ -390,7 +390,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                ;
 
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
-                       resp, sizeof(resp), mark_xfer, 0, 10000);
+                       resp, sizeof(resp), mark_xfer, 0, BULK_XFER_TIMEOUT);
        if (libusb_submit_transfer(xfer_in) != 0) {
                libusb_free_transfer(xfer_in);
                libusb_free_transfer(xfer_out);
@@ -411,7 +411,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        tv.tv_sec = 0;
        tv.tv_usec = 0;
        while (!xfer_in->user_data || !xfer_out->user_data) {
-               g_usleep(5000);
+               g_usleep(SLEEP_US_LONG);
                libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
        }
        if (xfer_in->user_data != GINT_TO_POINTER(1) ||
@@ -433,7 +433,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        usb_source_add(sdi->session, drvc->sr_ctx, 100,
                        lascar_el_usb_handle_events, (void *)sdi);
 
-       buf = g_try_malloc(4096);
+       buf = g_malloc(4096);
        libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
                        buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
        if ((ret = libusb_submit_transfer(xfer_in) != 0)) {