X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftesto%2Fprotocol.h;h=654eb6977a7fabbb5d4fc591ae60f351f5dfa681;hb=b0e1a1ecc4be698fb2cd48179ee48cf41e8f7f52;hp=c2c3a870d7f9262bee904504218cb16d83a761be;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git

diff --git a/src/hardware/testo/protocol.h b/src/hardware/testo/protocol.h
index c2c3a870..654eb697 100644
--- a/src/hardware/testo/protocol.h
+++ b/src/hardware/testo/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "testo"
@@ -46,7 +46,7 @@
 #define EP_OUT               2 | LIBUSB_ENDPOINT_OUT
 
 struct testo_model {
-	char *name;
+	const char *name;
 	int request_size;
 	const uint8_t *request;
 };
@@ -57,13 +57,9 @@ struct dev_context {
 	const struct testo_model *model;
 
 	/* Acquisition settings */
-	uint64_t limit_msec;
-	uint64_t limit_samples;
-	void *cb_data;
+	struct sr_sw_limits sw_limits;
 
 	/* Operational state */
-	gint64 end_time;
-	uint64_t num_samples;
 	uint8_t channel_units[MAX_CHANNELS];
 	int num_channels;
 
@@ -75,7 +71,7 @@ struct dev_context {
 
 SR_PRIV int testo_set_serial_params(struct sr_usb_dev_inst *usb);
 SR_PRIV int testo_probe_channels(struct sr_dev_inst *sdi);
-SR_PRIV void receive_transfer(struct libusb_transfer *transfer);
+SR_PRIV void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer);
 SR_PRIV int testo_request_packet(const struct sr_dev_inst *sdi);
 SR_PRIV gboolean testo_check_packet_prefix(uint8_t *buf, int len);
 SR_PRIV uint16_t crc16_mcrf4xx(uint16_t crc, uint8_t *data, size_t len);