build: Portability fixes.

[libsigrok.git] / hardware / common / scpi_usbtmc_libusb.c

diff --git a/hardware/common/scpi_usbtmc_libusb.c b/hardware/common/scpi_usbtmc_libusb.c
index f6c18d9316328050123cb0111aa2383ce408ec46..c4470b5db6dee0d98b4983a8a79b2627bf9e5f08 100644 (file)
--- a/hardware/common/scpi_usbtmc_libusb.c
+++ b/hardware/common/scpi_usbtmc_libusb.c
@@ -270,12 +270,12 @@ static int scpi_usbtmc_libusb_open(void *priv)
                return SR_ERR;
        }
 
+       if (!uscpi->rigol_ds1000) {
        if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0) {
                sr_err("Failed to clear halt/stall condition for EP %d: %s.",
                       uscpi->bulk_in_ep, libusb_error_name(ret));
                return SR_ERR;
        }
-       if (!uscpi->rigol_ds1000)
        if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0) {
                sr_err("Failed to clear halt/stall condition for EP %d: %s.",
                       uscpi->bulk_out_ep, libusb_error_name(ret));
@@ -286,6 +286,7 @@ static int scpi_usbtmc_libusb_open(void *priv)
                       uscpi->interrupt_ep, libusb_error_name(ret));
                return SR_ERR;
        }
+       }
 
        /* Get capabilities. */
        ret = libusb_control_transfer(usb->devhdl,
@@ -315,18 +316,20 @@ static int scpi_usbtmc_libusb_open(void *priv)
        return SR_OK;
 }
 
-static int scpi_usbtmc_libusb_source_add(void *priv, int events, int timeout,
-                       sr_receive_data_callback_t cb, void *cb_data)
+static int scpi_usbtmc_libusb_source_add(struct sr_session *session,
+               void *priv, int events, int timeout, sr_receive_data_callback cb,
+               void *cb_data)
 {
        struct scpi_usbtmc_libusb *uscpi = priv;
        (void)events;
-       return usb_source_add(uscpi->ctx, timeout, cb, cb_data);
+       return usb_source_add(session, uscpi->ctx, timeout, cb, cb_data);
 }
 
-static int scpi_usbtmc_libusb_source_remove(void *priv)
+static int scpi_usbtmc_libusb_source_remove(struct sr_session *session,
+               void *priv)
 {
        struct scpi_usbtmc_libusb *uscpi = priv;
-       return usb_source_remove(uscpi->ctx);
+       return usb_source_remove(session, uscpi->ctx);
 }
 
 static void usbtmc_bulk_out_header_write(void *header, uint8_t MsgID,
@@ -528,16 +531,17 @@ static int scpi_usbtmc_libusb_close(void *priv)
        if (!usb->devhdl)
                return SR_ERR;
 
+       if (!uscpi->rigol_ds1000) {
        if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0)
                sr_err("Failed to clear halt/stall condition for EP %d: %s.",
                       uscpi->bulk_in_ep, libusb_error_name(ret));
-       if (!uscpi->rigol_ds1000)
        if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0)
                sr_err("Failed to clear halt/stall condition for EP %d: %s.",
                       uscpi->bulk_out_ep, libusb_error_name(ret));
        if ((ret = libusb_clear_halt(usb->devhdl, uscpi->interrupt_ep)) < 0)
                sr_err("Failed to clear halt/stall condition for EP %d: %s.",
                       uscpi->interrupt_ep, libusb_error_name(ret));
+       }
 
        if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)
                sr_err("Failed to release interface: %s.",