X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=c09e91aad58699116e381c4e45c74f11d3d8947b;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=72dee87a7245f114f185b117ad37b03683ba8f8b;hpb=a7da85f5299dd4162b26ab9c64224e52b52470ab;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index 72dee87a..c09e91aa 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -277,7 +277,7 @@ 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;
 
@@ -651,7 +651,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;
@@ -696,7 +697,7 @@ 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 +716,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 +750,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,18 +773,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);
+		sdi->driver->dev_acquisition_stop(sdi);
 		devc->last_sample_fin = g_get_monotonic_time();
 		return TRUE;
 	} else if (devc->limit_msec > 0) {
@@ -792,7 +793,7 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 
 		if (elapsed_time >= devc->limit_msec) {
 			sr_info("Sampling time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sdi->driver->dev_acquisition_stop(sdi);
 			devc->last_sample_fin = g_get_monotonic_time();
 			return TRUE;
 		}