X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=e7ea038fde796bf61fb9ad660af64e1acf0cac80;hb=b38e08fbb7b6fec5ff22495f13f039b1f7218361;hp=7b676a39e517834a348664983ee8f1a1211cc94d;hpb=ce3777ada98c5099d2867653f25239b85cf55708;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 7b676a39..e7ea038f 100644
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
@@ -29,12 +29,29 @@
 #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. */
 enum {
 	DIGITEK_DT4000ZC,
 	TEKPOWER_TP4000ZC,
 	METEX_ME31,
+	PEAKTECH_3410,
+	MASTECH_MAS345,
+	VA_VA18B,
+	METEX_M3640D,
+	PEAKTECH_4370,
+	PCE_PCE_DM32,
+	RADIOSHACK_22_168,
+	RADIOSHACK_22_805,
+	RADIOSHACK_22_812,
+	TECPEL_DMM_8061_SER,
+	VOLTCRAFT_VC820_SER,
+	VOLTCRAFT_VC840_SER,
+	UNI_T_UT61D_SER,
+	UNI_T_UT61E_SER,
 };
 
+#define DMM_COUNT 17
+
 struct dmm_info {
 	char *vendor;
 	char *device;
@@ -46,9 +63,11 @@ struct dmm_info {
 	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 *);
 };
 
-SR_PRIV struct dmm_info dmms[3];
+extern SR_PRIV struct dmm_info dmms[DMM_COUNT];
 
 #define DMM_BUFSIZE 256
 
@@ -57,24 +76,43 @@ struct dev_context {
 	/** The current sampling limit (in number of samples). */
 	uint64_t limit_samples;
 
+	/** The time limit (in milliseconds). */
+	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;
 
-	struct sr_serial_dev_inst *serial;
+	int64_t starttime;
 
 	uint8_t buf[DMM_BUFSIZE];
 	int bufoffset;
 	int buflen;
 };
 
-SR_PRIV int digitek_dt4000zc_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int tekpower_tp4000zc_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int metex_me31_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_DIGITEK_DT4000ZC(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TEKPOWER_TP4000ZC(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_METEX_ME31(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PEAKTECH_3410(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_MASTECH_MAS345(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VA_VA18B(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_METEX_M3640D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_805(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);
 
 SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info);
+SR_PRIV void dmm_details_va18b(struct sr_datafeed_analog *analog, void *info);
+SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info);
 
 #endif