unittests: Update for probe-groups changes.

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

diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/hardware/ikalogic-scanalogic2/protocol.c
index 75c78aca24c45b0ca611a58d2d396c7fc9ba4273..4c06e96dbd04b4951c668d4499480c47e96833a1 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.c
+++ b/hardware/ikalogic-scanalogic2/protocol.c
@@ -127,8 +127,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 +292,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 +423,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) {
@@ -655,7 +659,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
                        USB_INTERFACE);
 
                if (ret < 0) {
-                       sr_err("Failed to detach kernel driver: %i.",
+                       sr_err("Failed to detach kernel driver: %s.",
                                libusb_error_name(ret));
                        libusb_close(usb.devhdl);
                        return SR_ERR;
@@ -734,7 +738,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
        ret = libusb_release_interface(usb.devhdl, USB_INTERFACE);
 
        if (ret < 0) {
-               sr_err("Failed to release interface: %i.",
+               sr_err("Failed to release interface: %s.",
                        libusb_error_name(ret));
                libusb_close(usb.devhdl);
                return SR_ERR;
@@ -748,7 +752,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);
 }