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 e24c8ab4dcc62d9cd4ef44793e06f825517d26e4..22264573da0b742e1bece4658782a49d12edb6c5 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -20,14 +20,7 @@
 #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 {
@@ -61,15 +54,15 @@ enum {
 #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 *);