From: Gerhard Sittig <redacted>
Date: Wed, 18 Mar 2020 14:54:29 +0000 (+0100)
Subject: hameg-hmo: use common helper to setup description of an analog value
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=8c381a353c0ca87694c0f70557941c13929e314d;p=libsigrok.git

hameg-hmo: use common helper to setup description of an analog value

Replace an open coded sequence of assignments to an aggregate of several
related structures. Prefer the common sr_analog_init() routine instead.
---

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index d15d7a89..5986949b 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -1423,25 +1423,9 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		/* Truncate acquisition if a smaller number of samples has been requested. */
 		if (devc->samples_limit > 0 && analog.num_samples > devc->samples_limit)
 			analog.num_samples = devc->samples_limit;
-		analog.encoding = &encoding;
-		analog.meaning = &meaning;
-		analog.spec = &spec;
-
-		encoding.unitsize = sizeof(float);
-		encoding.is_signed = TRUE;
-		encoding.is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
-		encoding.is_bigendian = TRUE;
-#else
-		encoding.is_bigendian = FALSE;
-#endif
 		/* TODO: Use proper 'digits' value for this device (and its modes). */
-		encoding.digits = 2;
-		encoding.is_digits_decimal = FALSE;
-		encoding.scale.p = 1;
-		encoding.scale.q = 1;
-		encoding.offset.p = 0;
-		encoding.offset.q = 1;
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
+		encoding.is_signed = TRUE;
 		if (state->analog_channels[ch->index].probe_unit == 'V') {
 			meaning.mq = SR_MQ_VOLTAGE;
 			meaning.unit = SR_UNIT_VOLT;
@@ -1449,10 +1433,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 			meaning.mq = SR_MQ_CURRENT;
 			meaning.unit = SR_UNIT_AMPERE;
 		}
-		meaning.mqflags = 0;
 		meaning.channels = g_slist_append(NULL, ch);
-		/* TODO: Use proper 'digits' value for this device (and its modes). */
-		spec.spec_digits = 2;
 		packet.payload = &analog;
 		sr_session_send(sdi, &packet);
 		devc->num_samples = data->len / sizeof(float);