output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / baylibre-acme / protocol.c

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 629a601448cce8d829da19ffb797502a190b11f8..8d23b9e2f9875d36093115c52b1911c3e1ac1e2a 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -50,6 +51,7 @@ struct channel_group_priv {
 struct channel_priv {
        int ch_type;
        int fd;
+       int digits;
        float val;
        struct channel_group_priv *probe;
 };
@@ -164,8 +166,10 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
        probe_name_path(addr, path);
        status = g_file_get_contents(path->str, &buf, &size, &err);
        if (!status) {
-               sr_dbg("Name for probe %d can't be read: %s",
-                      prb_num, err->message);
+               /* Don't log "No such file or directory" messages. */
+               if (err->code != G_FILE_ERROR_NOENT)
+                       sr_dbg("Name for probe %d can't be read (%d): %s",
+                              prb_num, err->code, err->message);
                g_string_free(path, TRUE);
                g_error_free(err);
                return ret;
@@ -306,11 +310,11 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
 static int revB_addr_to_num(unsigned int addr)
 {
        switch (addr) {
-       case 0x44:      return 5;
-       case 0x45:      return 6;
-       case 0x42:      return 3;
-       case 0x43:      return 4;
-       default:        return addr - 0x3f;
+       case 0x44: return 5;
+       case 0x45: return 6;
+       case 0x42: return 3;
+       case 0x43: return 4;
+       default:   return addr - 0x3f;
        }
 }
 
@@ -328,9 +332,8 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
        if (hwmon < 0)
                return FALSE;
 
-       cg = g_malloc0(sizeof(struct sr_channel_group));
        cgp = g_malloc0(sizeof(struct channel_group_priv));
-       cg->priv = cgp;
+       cg = sr_channel_group_new(sdi, NULL, cgp);
 
        /*
         * See if we can read the EEPROM contents. If not, assume it's
@@ -376,8 +379,6 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
                sr_err("Invalid probe type: %d.", type);
        }
 
-       sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
-
        return TRUE;
 }
 
@@ -613,18 +614,18 @@ static int channel_to_unit(struct sr_channel *ch)
 }
 
 /* We need to scale measurements down from the units used by the drivers. */
-static float adjust_data(int val, int type)
+static int type_digits(int type)
 {
        switch (type) {
        case ENRG_PWR:
-               return ((float)val) / 1000000.0;
+               return 6;
        case ENRG_CURR: /* Fallthrough */
        case ENRG_VOL: /* Fallthrough */
        case TEMP_IN: /* Fallthrough */
        case TEMP_OUT:
-               return ((float)val) / 1000.0;
+               return 3;
        default:
-               return 0.0;
+               return 0;
        }
 }
 
@@ -648,7 +649,8 @@ static float read_sample(struct sr_channel *ch)
                return -1.0;
        }
 
-       return adjust_data(strtol(buf, NULL, 10), chp->ch_type);
+       chp->digits = type_digits(chp->ch_type);
+       return strtol(buf, NULL, 10) * powf(10, -chp->digits);
 }
 
 SR_PRIV int bl_acme_open_channel(struct sr_channel *ch)
@@ -698,8 +700,11 @@ SR_PRIV void bl_acme_close_channel(struct sr_channel *ch)
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
        uint64_t nrexpiration;
-       struct sr_datafeed_packet packet, framep;
-       struct sr_datafeed_analog_old analog;
+       struct sr_datafeed_packet packet;
+       struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
        struct sr_dev_inst *sdi;
        struct sr_channel *ch;
        struct channel_priv *chp;
@@ -718,9 +723,9 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
        if (!devc)
                return TRUE;
 
-       packet.type = SR_DF_ANALOG_OLD;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
+       sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
 
        if (read(devc->timer_fd, &nrexpiration, sizeof(nrexpiration)) < 0) {
                sr_warn("Failed to read timer information");
@@ -751,8 +756,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
         * accuracy.
         */
        for (i = 0; i < nrexpiration; i++) {
-               framep.type = SR_DF_FRAME_BEGIN;
-               sr_session_send(sdi, &framep);
+               std_session_send_df_frame_begin(sdi);
 
                /*
                 * Due to different units used in each channel we're sending
@@ -766,26 +770,27 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                                continue;
                        chonly.next = NULL;
                        chonly.data = ch;
-                       analog.channels = &chonly;
                        analog.num_samples = 1;
-                       analog.mq = channel_to_mq(chl->data);
-                       analog.unit = channel_to_unit(ch);
+                       analog.meaning->channels = &chonly;
+                       analog.meaning->mq = channel_to_mq(chl->data);
+                       analog.meaning->unit = channel_to_unit(ch);
 
                        if (i < 1)
                                chp->val = read_sample(ch);
 
+                       analog.encoding->digits  = chp->digits;
+                       analog.spec->spec_digits = chp->digits;
                        analog.data = &chp->val;
                        sr_session_send(sdi, &packet);
                }
 
-               framep.type = SR_DF_FRAME_END;
-               sr_session_send(sdi, &framep);
+               std_session_send_df_frame_end(sdi);
        }
 
        sr_sw_limits_update_samples_read(&devc->limits, 1);
 
        if (sr_sw_limits_check(&devc->limits)) {
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        }