Add support for the UNI-T UT61C multimeter.

[libsigrok.git] / hardware / serial-dmm / protocol.h

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 20c5ae7126034416a857d96c5d72ab12d4bea6cf..733e5ce14d10a6fd1df2c3b2859bf8d80df11ede 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -20,17 +20,11 @@
 #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,
        TEKPOWER_TP4000ZC,
        METEX_ME31,
@@ -52,23 +46,24 @@ enum {
        VOLTCRAFT_VC840_SER,
        UNI_T_UT60A_SER,
        UNI_T_UT60E_SER,
+       UNI_T_UT61C_SER,
        UNI_T_UT61D_SER,
        UNI_T_UT61E_SER,
        ISO_TECH_IDM103N,
 };
 
-#define DMM_COUNT 24
+#define DMM_COUNT 26
 
 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 *);
@@ -110,6 +105,7 @@ struct dev_context {
        int buflen;
 };
 
+SR_PRIV int receive_data_BBCGM_M2110(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);
@@ -131,6 +127,7 @@ 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_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);