Don't reset instance list in scan() callback

[libsigrok.git] / src / hardware / testo / protocol.c

diff --git a/src/hardware/testo/protocol.c b/src/hardware/testo/protocol.c
index e2c43c080667784a5b31867bedb61bd26dff2371..b043eecf7ed59ac98d42191aa08ae323f07f5208 100644 (file)
--- a/src/hardware/testo/protocol.c
+++ b/src/hardware/testo/protocol.c
@@ -25,28 +25,28 @@ SR_PRIV int testo_set_serial_params(struct sr_usb_dev_inst *usb)
 {
        int ret;
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_BAUDRATE,
+       if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_BAUDRATE,
                        FTDI_BAUDRATE_115200, FTDI_INDEX, NULL, 0, 10)) < 0) {
-                       sr_err("Failed to set baudrate: %s", libusb_error_name(ret));
-                       return SR_ERR;
+               sr_err("Failed to set baudrate: %s", libusb_error_name(ret));
+               return SR_ERR;
        }
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_PARAMS,
+       if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_PARAMS,
                        FTDI_PARAMS_8N1, FTDI_INDEX, NULL, 0, 10)) < 0) {
-                       sr_err("Failed to set comm parameters: %s", libusb_error_name(ret));
-                       return SR_ERR;
+               sr_err("Failed to set comm parameters: %s", libusb_error_name(ret));
+               return SR_ERR;
        }
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_FLOWCTRL,
+       if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_FLOWCTRL,
                        FTDI_FLOW_NONE, FTDI_INDEX, NULL, 0, 10)) < 0) {
-                       sr_err("Failed to set flow control: %s", libusb_error_name(ret));
-                       return SR_ERR;
+               sr_err("Failed to set flow control: %s", libusb_error_name(ret));
+               return SR_ERR;
        }
 
-    if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_MODEMCTRL,
+       if ((ret = libusb_control_transfer(usb->devhdl, 0x40, FTDI_SET_MODEMCTRL,
                        FTDI_MODEM_ALLHIGH, FTDI_INDEX, NULL, 0, 10)) < 0) {
-                       sr_err("Failed to set modem control: %s", libusb_error_name(ret));
-                       return SR_ERR;
+               sr_err("Failed to set modem control: %s", libusb_error_name(ret));
+               return SR_ERR;
        }
 
        return SR_OK;
@@ -61,7 +61,7 @@ SR_PRIV int testo_probe_channels(struct sr_dev_inst *sdi)
        struct sr_usb_dev_inst *usb;
        int unit, packet_len, len, i;
        unsigned char packet[MAX_REPLY_SIZE], buf[MAX_REPLY_SIZE];
-       char *probe_name;
+       const char *probe_name;
 
        devc = sdi->priv;
        usb = sdi->conn;
@@ -158,8 +158,7 @@ SR_PRIV int testo_request_packet(const struct sr_dev_inst *sdi)
                        receive_transfer, (void *)sdi, 100);
        if ((ret = libusb_submit_transfer(devc->out_transfer) != 0)) {
                sr_err("Failed to request packet: %s.", libusb_error_name(ret));
-               sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi,
-                               devc->cb_data);
+               sdi->driver->dev_acquisition_stop((struct sr_dev_inst *)sdi);
                return SR_ERR;
        }
        sr_dbg("Requested new packet.");