drivers: SR_CONF_CAPTURE_RATIO fixes.

[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 45f5917a65e11b4d6f00f9be949cb0f0ea2f10cc..3a14b20b415b740600b7656ff873a96e71794d17 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/protocol.h
+++ b/src/hardware/ikalogic-scanalogic2/protocol.h
@@ -24,14 +24,11 @@
 #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"
 
-#define VENDOR_NAME                    "IKALOGIC"
-#define MODEL_NAME                     "Scanalogic-2"
-
 #define USB_VID_PID                    "20a0.4123"
 #define USB_INTERFACE                  0
 #define USB_TIMEOUT_MS                 (5 * 1000)
@@ -120,7 +117,6 @@ enum {
        STATE_WAIT_DEVICE_READY
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
        /* Current selected samplerate. */
        uint64_t samplerate;
@@ -142,13 +138,11 @@ struct dev_context {
        uint8_t trigger_channel;
        uint8_t trigger_type;
 
-       unsigned int capture_ratio;
+       uint64_t capture_ratio;
 
        /* 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,20 +211,18 @@ 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,
                                  uint64_t limit_samples);
 SR_PRIV int sl2_convert_trigger(const struct sr_dev_inst *sdi);
-SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi,
-                                 uint64_t capture_ratio);
 SR_PRIV int sl2_set_after_trigger_delay(const struct sr_dev_inst *sdi,
                                        uint64_t after_trigger_delay);
 SR_PRIV void sl2_calculate_trigger_samples(const struct sr_dev_inst *sdi);
-SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
-               struct device_info *dev_info);
+SR_PRIV int sl2_get_device_info(struct sr_dev_driver *di,
+               struct sr_usb_dev_inst usb, struct device_info *dev_info);
 SR_PRIV int sl2_transfer_in(libusb_device_handle *dev_handle, uint8_t *data);
 SR_PRIV int sl2_transfer_out(libusb_device_handle *dev_handle, uint8_t *data);