X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fserial-dmm%2Fprotocol.h;h=77f89c741defe2ab3bf4fdc59925d7af5e67ade7;hb=ea4c6c2311f2c31ccf6863b13a815918ccee974b;hp=047c24dd7291707bb38c76adcba6c7736ac7aaca;hpb=6dca2f16eedfbcaa0ea4e45c7d58bbf596fa1012;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 047c24dd..77f89c74 100644
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -29,6 +29,7 @@
 #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,
@@ -36,8 +37,15 @@ enum {
 	PEAKTECH_3410,
 	MASTECH_MAS345,
 	VA_VA18B,
+	METEX_M3640D,
+	PEAKTECH_4370,
+	PCE_PCE_DM32,
+	RADIOSHACK_22_168,
+	RADIOSHACK_22_812,
 };
 
+#define DMM_COUNT 11
+
 struct dmm_info {
 	char *vendor;
 	char *device;
@@ -49,9 +57,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[6];
+extern SR_PRIV struct dmm_info dmms[DMM_COUNT];
 
 #define DMM_BUFSIZE 256
 
@@ -73,15 +83,21 @@ struct dev_context {
 	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 peaktech_3410_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int mastech_mas345_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV int va_va18b_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_812(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