Centralise duplicated logging helper defines.

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

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index ca27f8421b353025571f205ac1412db424c30a47..22264573da0b742e1bece4658782a49d12edb6c5 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,
@@ -38,6 +32,7 @@ enum {
        MASTECH_MAS345,
        VA_VA18B,
        METEX_M3640D,
+       METEX_M4650CR,
        PEAKTECH_4370,
        PCE_PCE_DM32,
        RADIOSHACK_22_168,
@@ -45,6 +40,7 @@ enum {
        RADIOSHACK_22_812,
        TECPEL_DMM_8061_SER,
        VOLTCRAFT_M3650D,
+       VOLTCRAFT_M4650CR,
        VOLTCRAFT_VC820_SER,
        VOLTCRAFT_VC830_SER,
        VOLTCRAFT_VC840_SER,
@@ -55,20 +51,31 @@ enum {
        ISO_TECH_IDM103N,
 };
 
-#define DMM_COUNT 22
+#define DMM_COUNT 25
 
 struct dmm_info {
+       /** Manufacturer/brand. */
        char *vendor;
+       /** Model. */
        char *device;
+       /** serialconn string. */
        char *conn;
+       /** Baud rate. */
        uint32_t baudrate;
+       /** Packet size in bytes. */
        int packet_size;
+       /** Packet request function. */
        int (*packet_request)(struct sr_serial_dev_inst *);
+       /** Packet validation function. */
        gboolean (*packet_valid)(const uint8_t *);
+       /** Packet parsing function. */
        int (*packet_parse)(const uint8_t *, float *,
                            struct sr_datafeed_analog *, void *);
+       /** */
        void (*dmm_details)(struct sr_datafeed_analog *, void *);
+       /** libsigrok driver info struct. */
        struct sr_dev_driver *di;
+       /** Data reception function. */
        int (*receive_data)(int, int, void *);
 };
 
@@ -97,6 +104,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);
@@ -104,6 +112,7 @@ 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_METEX_M4650CR(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);
@@ -111,6 +120,7 @@ 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_M3650D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_M4650CR(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_VC830_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);