X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fprotocol.c;h=89f5bc9c2ff063383acb5c4f91285ae01d2f8a5e;hb=91b77e6b1d126b6406978386ec325f1c6d5bffd8;hp=46e9ae62baf6071233c1df660853e14081b8eefd;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git

diff --git a/src/hardware/testo/protocol.c b/src/hardware/testo/protocol.c
index 46e9ae62..89f5bc9c 100644
--- a/src/hardware/testo/protocol.c
+++ b/src/hardware/testo/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include "protocol.h"
 
@@ -24,25 +25,25 @@ 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;
 	}
 
-    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;
 	}
 
-    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;
 	}
 
-    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;
@@ -60,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;
@@ -81,7 +82,7 @@ SR_PRIV int testo_probe_channels(struct sr_dev_inst *sdi)
 		return SR_ERR;
 
 	packet_len = 0;
-	while(TRUE) {
+	while (TRUE) {
 		if (libusb_bulk_transfer(usb->devhdl, EP_IN, buf, MAX_REPLY_SIZE,
 				&len, 250) < 0)
 			return SR_ERR;
@@ -157,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.");
@@ -222,7 +222,7 @@ SR_PRIV void testo_receive_packet(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct sr_channel *ch;
 	GString *dbg;
 	float value;
@@ -241,7 +241,7 @@ SR_PRIV void testo_receive_packet(const struct sr_dev_inst *sdi)
 		g_string_free(dbg, TRUE);
 	}
 
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
 	analog.num_samples = 1;
 	analog.mqflags = 0;