X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.h;h=a6a8f7186c557d506894531ae275017855bd309b;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=fbfd9556d823591869d2078691c6740a7313b85b;hpb=4554314c4f72d8df69b7236cb19d15a00fdceaeb;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index fbfd9556..a6a8f718 100644
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -27,33 +27,25 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "uni-t-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
-
-/* Note: When adding entries here, don't forget to update DMM_COUNT. */
+#define LOG_PREFIX "uni-t-dmm"
+
 enum {
-	TECPEL_DMM_8060,
 	TECPEL_DMM_8061,
+	UNI_T_UT60A,
+	UNI_T_UT60E,
 	UNI_T_UT61D,
 	UNI_T_UT61E,
 	VOLTCRAFT_VC820,
+	VOLTCRAFT_VC830,
 	VOLTCRAFT_VC840,
+	TENMA_72_7745,
 };
 
-#define DMM_COUNT 6
-
 struct dmm_info {
 	char *vendor;
 	char *device;
 	uint32_t baudrate;
 	int packet_size;
-	int (*packet_request)(struct sr_serial_dev_inst *);
 	gboolean (*packet_valid)(const uint8_t *);
 	int (*packet_parse)(const uint8_t *, float *,
 			    struct sr_datafeed_analog *, void *);
@@ -62,8 +54,6 @@ struct dmm_info {
 	int (*receive_data)(int, int, void *);
 };
 
-extern SR_PRIV struct dmm_info udmms[DMM_COUNT];
-
 #define CHUNK_SIZE		8
 
 #define DMM_BUFSIZE		256
@@ -82,6 +72,8 @@ struct dev_context {
 	/** The current number of already received samples. */
 	uint64_t num_samples;
 
+	int64_t starttime;
+
 	gboolean first_run;
 
 	uint8_t protocol_buf[DMM_BUFSIZE];
@@ -89,11 +81,13 @@ struct dev_context {
 	uint8_t buflen;
 };
 
-SR_PRIV int receive_data_TECPEL_DMM_8060(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_TECPEL_DMM_8061(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_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_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);
 
 #endif