Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

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

diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/hardware/ikalogic-scanalogic2/protocol.c
index d1fb3beb763ebee85424368f75512d2527e8310e..475b6225b4c3290111e0041a7c724c08a4da1921 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.c
+++ b/hardware/ikalogic-scanalogic2/protocol.c
@@ -26,17 +26,14 @@ extern uint64_t sl2_samplerates[NUM_SAMPLERATES];
 
 static void stop_acquisition(struct sr_dev_inst *sdi)
 {
+       struct drv_context *drvc = sdi->driver->priv;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       unsigned int i;
 
        devc = sdi->priv;
 
        /* Remove USB file descriptors from polling. */
-       for (i = 0; i < devc->num_usbfd; i++)
-               sr_source_remove(devc->usbfd[i]);
-
-       g_free(devc->usbfd);
+       usb_source_remove(drvc->sr_ctx);
 
        packet.type = SR_DF_END;
        sr_session_send(devc->cb_data, &packet);
@@ -46,17 +43,14 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
 
 static void abort_acquisition(struct sr_dev_inst *sdi)
 {
+       struct drv_context *drvc = sdi->driver->priv;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       unsigned int i;
 
        devc = sdi->priv;
 
        /* Remove USB file descriptors from polling. */
-       for (i = 0; i < devc->num_usbfd; i++)
-               sr_source_remove(devc->usbfd[i]);
-
-       g_free(devc->usbfd);
+       usb_source_remove(drvc->sr_ctx);
 
        packet.type = SR_DF_END;
        sr_session_send(devc->cb_data, &packet);
@@ -127,8 +121,8 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
                        /*
                         * Adjust the position of the first sample to be
                         * processed because possibly more samples than
-                        * necessary might have been aquired. This is because
-                        * the number of aquired samples is always rounded up
+                        * necessary might have been acquired. This is because
+                        * the number of acquired samples is always rounded up
                         * to a multiple of 8.
                         */
                        k = k - (devc->pre_trigger_bytes * 8) +
@@ -292,7 +286,9 @@ SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
                return;
        }
 
-       sr_spew("State changed from %i to %i.", devc->state, devc->next_state);
+       if (devc->state != devc->next_state)
+               sr_spew("State changed from %i to %i.",
+                       devc->state, devc->next_state);
        devc->state = devc->next_state;
 
        if (devc->state == STATE_WAIT_DATA_READY) {
@@ -421,7 +417,9 @@ SR_PRIV void sl2_receive_transfer_out( struct libusb_transfer *transfer)
                return;
        }
 
-       sr_spew("State changed from %i to %i.", devc->state, devc->next_state);
+       if (devc->state != devc->next_state)
+               sr_spew("State changed from %i to %i.",
+                       devc->state, devc->next_state);
        devc->state = devc->next_state;
 
        if (devc->state == STATE_IDLE) {
@@ -484,7 +482,7 @@ SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,
 SR_PRIV void sl2_configure_trigger(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *probe;
        uint8_t trigger_type;
        int probe_index, num_triggers_anyedge;
        char *trigger;
@@ -748,7 +746,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
 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_SET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
+               USB_HID_GET_REPORT, USB_HID_REPORT_TYPE_FEATURE, USB_INTERFACE,
                (unsigned char *)data, PACKET_LENGTH, USB_TIMEOUT);
 }