Use common usb_source_add and usb_source_remove functions.

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

diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/hardware/ikalogic-scanalogic2/protocol.h
index 4265f54c308987ed57d60d82b70ae0842defaa2a..8324204e03798e9676bc6f0684efd1fa83fe414b 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.h
+++ b/hardware/ikalogic-scanalogic2/protocol.h
@@ -49,6 +49,7 @@
 #define USB_REQUEST_TYPE_OUT           (LIBUSB_REQUEST_TYPE_CLASS | \
        LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_OUT)
 
+#define USB_HID_GET_REPORT             0x01
 #define USB_HID_SET_REPORT             0x09
 #define USB_HID_REPORT_TYPE_FEATURE    0x300
 
@@ -160,9 +161,6 @@ struct dev_context {
        /* Array to provide an index based access to all probes. */
        const struct sr_probe *probes[NUM_PROBES];
 
-       unsigned int num_usbfd;
-       int *usbfd;
-
        struct libusb_transfer *xfer_in, *xfer_out;
 
        /*
@@ -227,29 +225,22 @@ struct dev_context {
        gboolean transfer_error;
 };
 
-SR_PRIV int ikalogic_scanalogic2_receive_data(int fd, int revents,
-               void *cb_data);
-SR_PRIV void ikalogic_scanalogic2_receive_transfer_in(
-               struct libusb_transfer *transfer);
-SR_PRIV void ikalogic_scanalogic2_receive_transfer_out(
-               struct libusb_transfer *transfer);
-SR_PRIV int ikalogic_scanalogic2_set_samplerate(const struct sr_dev_inst *sdi,
+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 int sl2_set_samplerate(const struct sr_dev_inst *sdi,
                uint64_t samplerate);
-SR_PRIV int ikalogic_scanalogic2_set_limit_samples(
-               const struct sr_dev_inst *sdi, uint64_t limit_samples);
-SR_PRIV void ikalogic_scanalogic2_configure_trigger(
-               const struct sr_dev_inst *sdi);
-SR_PRIV int ikalogic_scanalogic2_set_capture_ratio(
-               const struct sr_dev_inst *sdi, uint64_t capture_ratio);
-SR_PRIV int ikaloigc_scanalogic2_set_after_trigger_delay(
-               const struct sr_dev_inst *sdi, uint64_t after_trigger_delay);
-SR_PRIV void ikalogic_scanalogic2_calculate_trigger_samples(
-               const struct sr_dev_inst *sdi);
-SR_PRIV int ikalogic_scanalogic2_get_device_info(struct sr_usb_dev_inst usb,
+SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,
+                                 uint64_t limit_samples);
+SR_PRIV void sl2_configure_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 ikalogic_scanalogic2_transfer_in(libusb_device_handle *dev_handle,
-               unsigned char *data);
-SR_PRIV int ikalogic_scanalogic2_transfer_out(libusb_device_handle *dev_handle,
-               unsigned char *data);
+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);
 
 #endif