X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=7a7a2cb171b5ba210c26f660f875fcf03887ac0b;hb=55462b8ba9f48931de9b9a7bfbc182a1d113b3b5;hp=663ff527a75c42c2851448a3dd716cd983393489;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.c b/src/hardware/ikalogic-scanalogic2/protocol.c
index 663ff527..7a7a2cb1 100644
--- a/src/hardware/ikalogic-scanalogic2/protocol.c
+++ b/src/hardware/ikalogic-scanalogic2/protocol.c
@@ -20,7 +20,6 @@
 #include "protocol.h"
 
 extern struct sr_dev_driver ikalogic_scanalogic2_driver_info;
-static struct sr_dev_driver *di = &ikalogic_scanalogic2_driver_info;
 
 extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 
@@ -199,6 +198,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
+	struct sr_dev_driver *di;
 	struct dev_context *devc;
 	struct drv_context *drvc;
 	struct timeval tv;
@@ -214,6 +214,7 @@ SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data
 	if (!(devc = sdi->priv))
 		return TRUE;
 
+	di = sdi->driver;
 	drvc = di->priv;
 	current_time = g_get_monotonic_time();
 
@@ -257,7 +258,7 @@ SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data
 	return TRUE;
 }
 
-SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_in( struct libusb_transfer *transfer)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -388,7 +389,7 @@ SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
 	}
 }
 
-SR_PRIV void sl2_receive_transfer_out( struct libusb_transfer *transfer)
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_out( struct libusb_transfer *transfer)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -642,7 +643,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
 	uint8_t buffer[PACKET_LENGTH];
 	int ret;
 
-	drvc = di->priv;
+	drvc = ikalogic_scanalogic2_driver_info.priv;
 
 	if (!dev_info)
 		return SR_ERR_ARG;
@@ -753,12 +754,12 @@ SR_PRIV int sl2_transfer_in(libusb_device_handle *dev_handle, uint8_t *data)
 {
 	return libusb_control_transfer(dev_handle, USB_REQUEST_TYPE_IN,
 		USB_HID_GET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
-		(unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT);
+		(unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT_MS);
 }
 
 SR_PRIV int sl2_transfer_out(libusb_device_handle *dev_handle, uint8_t *data)
 {
 	return libusb_control_transfer(dev_handle, USB_REQUEST_TYPE_OUT,
 		USB_HID_SET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
-		(unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT);
+		(unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT_MS);
 }