X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fdmm%2Frs9lcd.c;h=4328aefd910f9c63125051b5fd1348947f06cdf4;hb=5daed4bc6d984a4e03881bcc7fe9104e930a18e1;hp=d184aca712736d434d661c60ecab508aca535a86;hpb=0853d5e627cc8ec493e52197fc8e9b3175701128;p=libsigrok.git

diff --git a/hardware/common/dmm/rs9lcd.c b/hardware/common/dmm/rs9lcd.c
index d184aca7..4328aefd 100644
--- a/hardware/common/dmm/rs9lcd.c
+++ b/hardware/common/dmm/rs9lcd.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
@@ -35,14 +35,14 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "rs9lcd: "
-#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)
+/* 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)
 
 /* Byte 1 of the packet, and the modes it represents */
 #define IND1_HZ		(1 << 7)
@@ -262,7 +262,7 @@ static uint8_t decode_digit(uint8_t raw_digit)
 
 static double lcd_to_double(const struct rs9lcd_packet *rs_packet, int type)
 {
-	double rawval, multiplier = 1;
+	double rawval = 0, multiplier = 1;
 	uint8_t digit, raw_digit;
 	gboolean dp_reached = FALSE;
 	int i, end;
@@ -369,7 +369,7 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
 	case MODE_CONT:
 		analog->mq = SR_MQ_CONTINUITY;
 		analog->unit = SR_UNIT_BOOLEAN;
-		*analog->data = is_shortcirc(rs_packet);
+		rawval = is_shortcirc(rs_packet);
 		break;
 	case MODE_DIODE:
 		analog->mq = SR_MQ_VOLTAGE;
@@ -394,7 +394,7 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
 		} else {
 			/* We have either HI or LOW. */
 			analog->unit = SR_UNIT_BOOLEAN;
-			*analog->data = is_logic_high(rs_packet);
+			rawval = is_logic_high(rs_packet);
 		}
 		break;
 	case MODE_HFE:
@@ -412,10 +412,11 @@ SR_PRIV int sr_rs9lcd_parse(const uint8_t *buf, float *floatval,
 	case MODE_AMP_WIDTH:
 		analog->mq = SR_MQ_PULSE_WIDTH;
 		analog->unit = SR_UNIT_SECOND;
+		break;
 	case MODE_TEMP:
 		analog->mq = SR_MQ_TEMPERATURE;
 		/* We need to reparse. */
-		*analog->data = lcd_to_double(rs_packet, READ_TEMP);
+		rawval = lcd_to_double(rs_packet, READ_TEMP);
 		analog->unit = is_celsius(rs_packet) ?
 				SR_UNIT_CELSIUS : SR_UNIT_FAHRENHEIT;
 		break;