X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fprotocol.c;h=be36023f7bd56849b74e3b960cd78ba60a878af1;hb=3c996d8e231eb3ae2ff37182a0c9762bcd681770;hp=15717c02cfa7bc76891af20321c19ef7c0544a48;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git

diff --git a/src/hardware/testo/protocol.c b/src/hardware/testo/protocol.c
index 15717c02..be36023f 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"
 
@@ -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;
@@ -76,12 +77,12 @@ SR_PRIV int testo_probe_channels(struct sr_dev_inst *sdi)
 		libusb_bulk_transfer(usb->devhdl, EP_IN, buf, MAX_REPLY_SIZE, &len, 10);
 	} while (len > 2);
 
-	if (libusb_bulk_transfer(usb->devhdl, EP_OUT, devc->model->request,
+	if (libusb_bulk_transfer(usb->devhdl, EP_OUT, (unsigned char *)devc->model->request,
 			devc->model->request_size, &devc->reply_size, 10) < 0)
 		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;
@@ -153,7 +154,7 @@ SR_PRIV int testo_request_packet(const struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	libusb_fill_bulk_transfer(devc->out_transfer, usb->devhdl, EP_OUT,
-			devc->model->request, devc->model->request_size,
+			(unsigned char *)devc->model->request, devc->model->request_size,
 			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));
@@ -222,7 +223,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 +242,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;