Consistently use the "Sysclk" spelling everywhere.

[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 9d4f75076f75e05f83938c46acf6db99903cefd8..17ae5b90859e764eb852439dadeab9314823cd64 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;
        }
 }
 
@@ -613,18 +617,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 +652,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)
@@ -777,6 +782,8 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                        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);
                }
@@ -788,7 +795,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
        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;
        }