X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=ea25d95b00fcb3add71053454df369fd33363c32;hb=91b77e6b1d126b6406978386ec325f1c6d5bffd8;hp=db1b57573d9173ade5fe425b9d425e4df76ed040;hpb=4c3a4bca321df48455d4484753783dc6da17aa15;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index db1b5757..ea25d95b 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -167,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;
 	}
 
@@ -201,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;
 	}
 
@@ -277,13 +279,13 @@ static int read_probe_eeprom(unsigned int addr, struct probe_eeprom *eeprom)
 		return -1;
 
 	rd = read(fd, eeprom_buf, EEPROM_SIZE);
-	g_close(fd, NULL);
+	close(fd);
 	if (rd != EEPROM_SIZE)
 		return -1;
 
-	eeprom->type = RL32(eeprom_buf + EEPROM_OFF_TYPE);
-	eeprom->rev = RL32(eeprom_buf + EEPROM_OFF_REV);
-	eeprom->shunt = RL32(eeprom_buf + EEPROM_OFF_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. */
 
@@ -484,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;
 	}
 
@@ -651,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;
@@ -693,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;
@@ -715,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");
@@ -749,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
@@ -772,30 +775,18 @@ 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();