dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / ikalogic-scanalogic2 / protocol.h

diff --git a/src/hardware/ikalogic-scanalogic2/protocol.h b/src/hardware/ikalogic-scanalogic2/protocol.h
index 5e7c7b3b40686e9a149681dbf747709f2c1566ed..607933755cd93ca3aaa6f91567acef959081f852 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/protocol.h
+++ b/src/hardware/ikalogic-scanalogic2/protocol.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ikalogic-scanalogic2"
@@ -34,7 +34,7 @@
 
 #define USB_VID_PID                    "20a0.4123"
 #define USB_INTERFACE                  0
-#define USB_TIMEOUT                    5000
+#define USB_TIMEOUT_MS                 (5 * 1000)
 
 #define USB_REQUEST_TYPE_IN            (LIBUSB_REQUEST_TYPE_CLASS | \
        LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_IN)
@@ -147,8 +147,6 @@ struct dev_context {
        /* Time that the trigger will be delayed in milliseconds. */
        uint16_t after_trigger_delay;
 
-       void *cb_data;
-
        /* Array to provide an index based access to all channels. */
        const struct sr_channel *channels[NUM_CHANNELS];
 
@@ -217,8 +215,8 @@ struct dev_context {
 };
 
 SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents, void *cb_data);
-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_in(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL sl2_receive_transfer_out(struct libusb_transfer *transfer);
 SR_PRIV int sl2_set_samplerate(const struct sr_dev_inst *sdi,
                uint64_t samplerate);
 SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,