sr_analog_to_float: Support packets with multiple channels.

[libsigrok.git] / src / analog.c

diff --git a/src/analog.c b/src/analog.c
index 2116ad7585af721b53e7511beea9ad57a85bbb78..d2677a576065ab5c9b81fe899a5f828da8dfd891 100644 (file)
--- a/src/analog.c
+++ b/src/analog.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -47,6 +48,7 @@ struct unit_mq_string {
        char *str;
 };
 
+/* Please use the same order as in enum sr_unit (libsigrok.h). */
 static struct unit_mq_string unit_strings[] = {
        { SR_UNIT_VOLT, "V" },
        { SR_UNIT_AMPERE, "A" },
@@ -88,6 +90,7 @@ static struct unit_mq_string unit_strings[] = {
        ALL_ZERO
 };
 
+/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
 static struct unit_mq_string mq_strings[] = {
        { SR_MQFLAG_AC, " AC" },
        { SR_MQFLAG_DC, " DC" },
@@ -154,6 +157,8 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
        float offset;
        unsigned int b, i;
        gboolean bigendian;
+       unsigned int count = (analog->num_samples
+                       * g_slist_length(analog->meaning->channels));
 
 #ifdef WORDS_BIGENDIAN
        bigendian = TRUE;
@@ -171,14 +176,16 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog2 *analog,
                        && (analog->encoding->scale.p == analog->encoding->scale.q)
                        && analog->encoding->offset.p / (float)analog->encoding->offset.q == 0) {
                /* The data is already in the right format. */
-               memcpy(outbuf, analog->data, analog->num_samples * sizeof(float));
+               memcpy(outbuf, analog->data, count * sizeof(float));
        } else {
-               for (i = 0; i < analog->num_samples; i += analog->encoding->unitsize) {
+               for (i = 0; i < count; i += analog->encoding->unitsize) {
                        for (b = 0; b < analog->encoding->unitsize; b++) {
                                if (analog->encoding->is_bigendian == bigendian)
-                                       outbuf[i + b] = ((float *)analog->data)[i * analog->encoding->unitsize + b];
+                                       ((uint8_t *)outbuf)[i + b] =
+                                               ((uint8_t *)analog->data)[i * analog->encoding->unitsize + b];
                                else
-                                       outbuf[i + (analog->encoding->unitsize - b)] = ((float *)analog->data)[i * analog->encoding->unitsize + b];
+                                       ((uint8_t *)outbuf)[i + (analog->encoding->unitsize - b)] =
+                                               ((uint8_t *)analog->data)[i * analog->encoding->unitsize + b];
                        }
                        if (analog->encoding->scale.p != analog->encoding->scale.q)
                                outbuf[i] = (outbuf[i] * analog->encoding->scale.p) / analog->encoding->scale.q;