X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fdmm%2Frs9lcd.c;h=539c2335e265931e328dae71d6fc8c452848a85a;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=4328aefd910f9c63125051b5fd1348947f06cdf4;hpb=29a27196a13de2ffd9b671185e4b464b9db9b549;p=libsigrok.git

diff --git a/hardware/common/dmm/rs9lcd.c b/hardware/common/dmm/rs9lcd.c
index 4328aefd..539c2335 100644
--- a/hardware/common/dmm/rs9lcd.c
+++ b/hardware/common/dmm/rs9lcd.c
@@ -35,14 +35,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "rs9lcd: "
-#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 "rs9lcd"
 
 /* Byte 1 of the packet, and the modes it represents */
 #define IND1_HZ		(1 << 7)
@@ -174,7 +167,7 @@ static gboolean selection_good(const struct rs9lcd_packet *rs_packet)
 	count += (rs_packet->indicatrix2 & IND2_MICRO) ? 1 : 0;
 	count += (rs_packet->indicatrix2 & IND2_NANO)  ? 1 : 0;
 	if (count > 1) {
-		sr_err("More than one multiplier detected in packet.");
+		sr_dbg("More than one multiplier detected in packet.");
 		return FALSE;
 	}
 
@@ -190,7 +183,7 @@ static gboolean selection_good(const struct rs9lcd_packet *rs_packet)
 	count += (rs_packet->indicatrix2 & IND2_DUTY)  ? 1 : 0;
 	count += (rs_packet->indicatrix2 & IND2_HFE)   ? 1 : 0;
 	if (count > 1) {
-		sr_err("More than one measurement type detected in packet.");
+		sr_dbg("More than one measurement type detected in packet.");
 		return FALSE;
 	}
 
@@ -255,7 +248,7 @@ static uint8_t decode_digit(uint8_t raw_digit)
 	case LCD_9:
 		return 9;
 	default:
-		sr_err("Invalid digit byte: 0x%02x.", raw_digit);
+		sr_dbg("Invalid digit byte: 0x%02x.", raw_digit);
 		return 0xff;
 	}
 }
@@ -426,7 +419,7 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
 		analog->mqflags |= SR_MQFLAG_AC;
 		break;
 	default:
-		sr_err("Unknown mode: %d.", rs_packet->mode);
+		sr_dbg("Unknown mode: %d.", rs_packet->mode);
 		break;
 	}