Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / uni-t-dmm / protocol.h

diff --git a/hardware/uni-t-dmm/protocol.h b/hardware/uni-t-dmm/protocol.h
index 4c75300017c270e7eb48ef8dd00220ea6ffa2f02..a6a8f7186c557d506894531ae275017855bd309b 100644 (file)
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -27,29 +27,25 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "uni-t-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#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. */
+#define LOG_PREFIX "uni-t-dmm"
+
 enum {
+       TECPEL_DMM_8061,
+       UNI_T_UT60A,
+       UNI_T_UT60E,
        UNI_T_UT61D,
+       UNI_T_UT61E,
        VOLTCRAFT_VC820,
+       VOLTCRAFT_VC830,
+       VOLTCRAFT_VC840,
+       TENMA_72_7745,
 };
 
-#define DMM_COUNT 2
-
 struct dmm_info {
        char *vendor;
        char *device;
        uint32_t baudrate;
        int packet_size;
-       int (*packet_request)(struct sr_serial_dev_inst *);
        gboolean (*packet_valid)(const uint8_t *);
        int (*packet_parse)(const uint8_t *, float *,
                            struct sr_datafeed_analog *, void *);
@@ -58,8 +54,6 @@ struct dmm_info {
        int (*receive_data)(int, int, void *);
 };
 
-extern SR_PRIV struct dmm_info udmms[DMM_COUNT];
-
 #define CHUNK_SIZE             8
 
 #define DMM_BUFSIZE            256
@@ -78,7 +72,7 @@ struct dev_context {
        /** The current number of already received samples. */
        uint64_t num_samples;
 
-       struct sr_usb_dev_inst *usb;
+       int64_t starttime;
 
        gboolean first_run;
 
@@ -87,7 +81,13 @@ struct dev_context {
        uint8_t buflen;
 };
 
+SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60A(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60E(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC830(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
 
 #endif