Use driver name as the log prefix in standard functions

[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 969fea0f071218dfe34f0bc1bb9363a781af0e83..629a601448cce8d829da19ffb797502a190b11f8 100644 (file)
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -68,7 +68,16 @@ struct probe_eeprom {
        uint8_t pwr_sw;
        uint8_t serial[EEPROM_SERIAL_SIZE];
        int8_t tag[EEPROM_TAG_SIZE];
-} __attribute__((packed));
+};
+
+#define EEPROM_SIZE (3 * sizeof(uint32_t) + 1 + EEPROM_SERIAL_SIZE + EEPROM_TAG_SIZE)
+
+#define EEPROM_OFF_TYPE                0
+#define EEPROM_OFF_REV         sizeof(uint32_t)
+#define EEPROM_OFF_SHUNT       (2 * sizeof(uint32_t))
+#define EEPROM_OFF_PWR_SW      (3 * sizeof(uint32_t))
+#define EEPROM_OFF_SERIAL      (3 * sizeof(uint32_t) + 1)
+#define EEPROM_OFF_TAG         (EEPROM_OFF_SERIAL + EEPROM_SERIAL_SIZE)
 
 static const uint8_t enrg_i2c_addrs[] = {
        0x40, 0x41, 0x44, 0x45, 0x42, 0x43, 0x46, 0x47,
@@ -158,6 +167,7 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
                sr_dbg("Name for probe %d can't be read: %s",
                       prb_num, err->message);
                g_string_free(path, TRUE);
+               g_error_free(err);
                return ret;
        }
 
@@ -192,6 +202,7 @@ static int get_hwmon_index(unsigned int addr)
        if (!dir) {
                sr_err("Error opening %s: %s", path->str, err->message);
                g_string_free(path, TRUE);
+               g_error_free(err);
                return -1;
        }
 
@@ -256,9 +267,8 @@ static void append_channel(struct sr_dev_inst *sdi, struct sr_channel_group *cg,
 
 static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
 {
-       static const ssize_t len = sizeof(struct probe_eeprom);
-
        GString *path = g_string_sized_new(64);
+       char eeprom_buf[EEPROM_SIZE];
        ssize_t rd;
        int fd;
 
@@ -268,18 +278,16 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
        if (fd < 0)
                return -1;
 
-       rd = read(fd, eeprom, len);
-       g_close(fd, NULL);
-       if (rd != len)
+       rd = read(fd, eeprom_buf, EEPROM_SIZE);
+       close(fd);
+       if (rd != EEPROM_SIZE)
                return -1;
 
-       /*
-        * All integer types are in network byte order. Convert them to
-        * host order before proceeding.
-        */
-       eeprom->type = ntohl(eeprom->type);
-       eeprom->rev = ntohl(eeprom->rev);
-       eeprom->shunt = ntohl(eeprom->shunt);
+       eeprom->type = RB32(eeprom_buf + EEPROM_OFF_TYPE);
+       eeprom->rev = RB32(eeprom_buf + EEPROM_OFF_REV);
+       eeprom->shunt = RB32(eeprom_buf + EEPROM_OFF_SHUNT);
+       eeprom->pwr_sw = R8(eeprom_buf + EEPROM_OFF_PWR_SW);
+       /* Don't care about the serial number and tag for now. */
 
        /* Check if we have some sensible values. */
        if (eeprom->rev != 'B')
@@ -328,6 +336,7 @@ SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
         * See if we can read the EEPROM contents. If not, assume it's
         * a revision A probe.
         */
+       memset(&eeprom, 0, sizeof(struct probe_eeprom));
        status = read_probe_eeprom(addr, &eeprom);
        cgp->rev = status < 0 ? ACME_REV_A : ACME_REV_B;
 
@@ -477,6 +486,7 @@ SR_PRIV int bl_acme_get_shunt(const struct sr_channel_group *cg,
        if (!status) {
                sr_err("Error reading shunt resistance: %s", err->message);
                ret = SR_ERR_IO;
+               g_error_free(err);
                goto out;
        }
 
@@ -644,7 +654,8 @@ static float read_sample(struct sr_channel *ch)
 SR_PRIV int bl_acme_open_channel(struct sr_channel *ch)
 {
        struct channel_priv *chp;
-       char path[64], *file;
+       char path[64];
+       const char *file;
        int fd;
 
        chp = ch->priv;
@@ -686,10 +697,9 @@ 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)
 {
-       uint32_t cur_time, elapsed_time;
        uint64_t nrexpiration;
        struct sr_datafeed_packet packet, framep;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_dev_inst *sdi;
        struct sr_channel *ch;
        struct channel_priv *chp;
@@ -708,9 +718,9 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
        if (!devc)
                return TRUE;
 
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
        if (read(devc->timer_fd, &nrexpiration, sizeof(nrexpiration)) < 0) {
                sr_warn("Failed to read timer information");
@@ -742,7 +752,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
         */
        for (i = 0; i < nrexpiration; i++) {
                framep.type = SR_DF_FRAME_BEGIN;
-               sr_session_send(cb_data, &framep);
+               sr_session_send(sdi, &framep);
 
                /*
                 * Due to different units used in each channel we're sending
@@ -765,32 +775,19 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
                                chp->val = read_sample(ch);
 
                        analog.data = &chp->val;
-                       sr_session_send(cb_data, &packet);
+                       sr_session_send(sdi, &packet);
                }
 
                framep.type = SR_DF_FRAME_END;
-               sr_session_send(cb_data, &framep);
+               sr_session_send(sdi, &framep);
        }
 
-       devc->samples_read++;
-       if (devc->limit_samples > 0 &&
-           devc->samples_read >= devc->limit_samples) {
-               sr_info("Requested number of samples reached.");
-               sdi->driver->dev_acquisition_stop(sdi, cb_data);
-               devc->last_sample_fin = g_get_monotonic_time();
+       sr_sw_limits_update_samples_read(&devc->limits, 1);
+
+       if (sr_sw_limits_check(&devc->limits)) {
+               sdi->driver->dev_acquisition_stop(sdi);
                return TRUE;
-       } else if (devc->limit_msec > 0) {
-               cur_time = g_get_monotonic_time();
-               elapsed_time = cur_time - devc->start_time;
-
-               if (elapsed_time >= devc->limit_msec) {
-                       sr_info("Sampling time limit reached.");
-                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
-                       devc->last_sample_fin = g_get_monotonic_time();
-                       return TRUE;
-               }
        }
 
-       devc->last_sample_fin = g_get_monotonic_time();
        return TRUE;
 }