X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=8e065642addbfce7c785bb8618565b5450366bbc;hb=104ed125532596a43f2d95d9a5d05bd6d51b9afa;hp=e24c8ab4dcc62d9cd4ef44793e06f825517d26e4;hpb=825da8b20f8eb879cd6b3e7911b4aa7b35a5b9ed;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index e24c8ab4..8e065642 100644
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -20,16 +20,8 @@
 #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "serial-dmm: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "serial-dmm"
 
-/* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {
 	BBCGM_M2110,
 	DIGITEK_DT4000ZC,
@@ -38,6 +30,7 @@ enum {
 	PEAKTECH_3410,
 	MASTECH_MAS345,
 	VA_VA18B,
+	VA_VA40B,
 	METEX_M3640D,
 	METEX_M4650CR,
 	PEAKTECH_4370,
@@ -53,23 +46,26 @@ enum {
 	VOLTCRAFT_VC840_SER,
 	UNI_T_UT60A_SER,
 	UNI_T_UT60E_SER,
+	UNI_T_UT60G_SER,
+	UNI_T_UT61B_SER,
+	UNI_T_UT61C_SER,
 	UNI_T_UT61D_SER,
 	UNI_T_UT61E_SER,
 	ISO_TECH_IDM103N,
+	TENMA_72_7745_SER,
+	TENMA_72_7750_SER,
 };
 
-#define DMM_COUNT 25
-
 struct dmm_info {
-	/** Manufacturer/brand */
+	/** Manufacturer/brand. */
 	char *vendor;
-	/** Model */
+	/** Model. */
 	char *device;
-	/** serialconn string */
+	/** serialconn string. */
 	char *conn;
-	/** Baud rate */
+	/** Baud rate. */
 	uint32_t baudrate;
-	/** Packet size [bytes]. */
+	/** Packet size in bytes. */
 	int packet_size;
 	/** Packet request function. */
 	int (*packet_request)(struct sr_serial_dev_inst *);
@@ -86,7 +82,7 @@ struct dmm_info {
 	int (*receive_data)(int, int, void *);
 };
 
-extern SR_PRIV struct dmm_info dmms[DMM_COUNT];
+extern SR_PRIV struct dmm_info dmms[];
 
 #define DMM_BUFSIZE 256
 
@@ -118,6 +114,7 @@ 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_VA_VA40B(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_METEX_M4650CR(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data);
@@ -133,13 +130,13 @@ SR_PRIV int receive_data_VOLTCRAFT_VC830_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_UT60A_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT60E_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60G_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61B_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61C_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 int receive_data_ISO_TECH_IDM103N(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);
+SR_PRIV int receive_data_TENMA_72_7745_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TENMA_72_7750_SER(int fd, int revents, void *cb_data);
 
 #endif