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 446f6a79cdfe3111359cbda4d424bda403d5df9a..a6a8f7186c557d506894531ae275017855bd309b 100644 (file)
--- a/hardware/uni-t-dmm/protocol.h
+++ b/hardware/uni-t-dmm/protocol.h
@@ -27,16 +27,8 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "uni-t-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)
-
-/* 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,
@@ -46,10 +38,9 @@ enum {
        VOLTCRAFT_VC820,
        VOLTCRAFT_VC830,
        VOLTCRAFT_VC840,
+       TENMA_72_7745,
 };
 
-#define DMM_COUNT 8
-
 struct dmm_info {
        char *vendor;
        char *device;
@@ -63,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