X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.h;h=9ec354fb7d5a0dd8d153699cf546bdf8225dcf87;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=b37408b0fc56e6ec3a755f3f34a7874a37a4eda2;hpb=c36f78f7728e8b5263bed440530a61caa6e30a26;p=libsigrok.git

diff --git a/src/hardware/uni-t-dmm/protocol.h b/src/hardware/uni-t-dmm/protocol.h
index b37408b0..9ec354fb 100644
--- a/src/hardware/uni-t-dmm/protocol.h
+++ b/src/hardware/uni-t-dmm/protocol.h
@@ -24,48 +24,22 @@
 #include <stdint.h>
 #include <glib.h>
 #include <libusb.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "uni-t-dmm"
 
-enum {
-	TECPEL_DMM_8061,
-	UNI_T_UT372,
-	UNI_T_UT60A,
-	UNI_T_UT60E,
-	UNI_T_UT60G,
-	UNI_T_UT61B,
-	UNI_T_UT61C,
-	UNI_T_UT61D,
-	UNI_T_UT61E,
-	UNI_T_UT71A,
-	UNI_T_UT71B,
-	UNI_T_UT71C,
-	UNI_T_UT71D,
-	UNI_T_UT71E,
-	VOLTCRAFT_VC820,
-	VOLTCRAFT_VC830,
-	VOLTCRAFT_VC840,
-	VOLTCRAFT_VC870,
-	VOLTCRAFT_VC920,
-	VOLTCRAFT_VC940,
-	VOLTCRAFT_VC960,
-	TENMA_72_7745,
-	TENMA_72_7750,
-};
-
 struct dmm_info {
-	char *vendor;
-	char *device;
+	struct sr_dev_driver di;
+	const char *vendor;
+	const char *device;
 	uint32_t baudrate;
 	int packet_size;
 	gboolean (*packet_valid)(const uint8_t *);
 	int (*packet_parse)(const uint8_t *, float *,
-			    struct sr_datafeed_analog *, void *);
-	void (*dmm_details)(struct sr_datafeed_analog *, void *);
-	struct sr_dev_driver *di;
-	int (*receive_data)(int, int, void *);
+			    struct sr_datafeed_analog_old *, void *);
+	void (*dmm_details)(struct sr_datafeed_analog_old *, void *);
+	gsize info_size;
 };
 
 #define CHUNK_SIZE		8
@@ -74,19 +48,7 @@ struct dmm_info {
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	/** The current sampling limit (in number of samples). */
-	uint64_t limit_samples;
-
-	/** The current sampling limit (in ms). */
-	uint64_t limit_msec;
-
-	/** Opaque pointer passed in by the frontend. */
-	void *cb_data;
-
-	/** The current number of already received samples. */
-	uint64_t num_samples;
-
-	int64_t starttime;
+	struct sr_sw_limits limits;
 
 	gboolean first_run;
 
@@ -95,28 +57,6 @@ struct dev_context {
 	uint8_t buflen;
 };
 
-SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT372(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT60A(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT60E(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT60G(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT61B(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT61C(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT71A(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT71B(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT71C(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT71D(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_UNI_T_UT71E(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC830(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC870(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC920(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC940(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC960(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_TENMA_72_7745(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_TENMA_72_7750(int fd, int revents, void *cb_data);
+SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data);
 
 #endif