X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fprotocol.c;h=b633977d662399f7459762baf0ab3fb71f9b1632;hb=45884333ff8641c86d9808b46dde9f571083c10d;hp=35ec618461c57eb1cfca134149bab2a9ea9615d2;hpb=5a1afc0907abfee5848484f944789213d6be9752;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index 35ec6184..b633977d 100644
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -328,7 +329,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
 	if (!(devc = sdi->priv))
 		return SR_ERR;
 
-	sr_dbg("Starting data capture for frameset %lu of %lu",
+	sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64,
 	       devc->num_frames + 1, devc->limit_frames);
 
 	switch (devc->model->series->protocol) {
@@ -538,7 +539,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	struct sr_scpi_dev_inst *scpi;
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct sr_datafeed_logic logic;
 	double vdiv, offset;
 	int len, i, vref;
@@ -616,8 +617,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 			if (len == -1) {
 				sr_err("Read error, aborting capture.");
 				packet.type = SR_DF_FRAME_END;
-				sr_session_send(cb_data, &packet);
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
+				sr_session_send(sdi, &packet);
+				sdi->driver->dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			/* At slow timebases in live capture the DS2072
@@ -649,8 +650,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	if (len == -1) {
 		sr_err("Read error, aborting capture.");
 		packet.type = SR_DF_FRAME_END;
-		sr_session_send(cb_data, &packet);
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sr_session_send(sdi, &packet);
+		sdi->driver->dev_acquisition_stop(sdi);
 		return TRUE;
 	}
 
@@ -674,9 +675,9 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 		analog.mq = SR_MQ_VOLTAGE;
 		analog.unit = SR_UNIT_VOLT;
 		analog.mqflags = 0;
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_slist_free(analog.channels);
 	} else {
 		logic.length = len;
@@ -687,7 +688,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 		logic.data = devc->buffer;
 		packet.type = SR_DF_LOGIC;
 		packet.payload = &logic;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 	}
 
 	if (devc->num_block_read == devc->num_block_bytes) {
@@ -706,13 +707,14 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 		if (!sr_scpi_read_complete(scpi)) {
 			sr_err("Read should have been completed");
 			packet.type = SR_DF_FRAME_END;
-			sr_session_send(cb_data, &packet);
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sr_session_send(sdi, &packet);
+			sdi->driver->dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 		devc->num_block_read = 0;
 	} else {
-		sr_dbg("%d of %d block bytes read", devc->num_block_read, devc->num_block_bytes);
+		sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+			devc->num_block_read, devc->num_block_bytes);
 	}
 
 	devc->num_channel_bytes += len;
@@ -740,11 +742,11 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 	} else {
 		/* Done with this frame. */
 		packet.type = SR_DF_FRAME_END;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 
 		if (++devc->num_frames == devc->limit_frames) {
 			/* Last frame, stop capture. */
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sdi->driver->dev_acquisition_stop(sdi);
 		} else {
 			/* Get the next frame, starting with the first channel. */
 			devc->channel_entry = devc->enabled_channels;
@@ -753,7 +755,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
 
 			/* Start of next frame. */
 			packet.type = SR_DF_FRAME_BEGIN;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 		}
 	}