X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fprotocol.c;h=57f93b14286d9af9ddea74ebbc06c6c7f62b6bd6;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=5be8d146d31fe1342b894a9e914dcab2d3e74703;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/maynuo-m97/protocol.c b/src/hardware/maynuo-m97/protocol.c
index 5be8d146..57f93b14 100644
--- a/src/hardware/maynuo-m97/protocol.c
+++ b/src/hardware/maynuo-m97/protocol.c
@@ -103,7 +103,7 @@ SR_PRIV int maynuo_m97_get_model_version(struct sr_modbus_dev_inst *modbus,
 
 SR_PRIV const char *maynuo_m97_mode_to_str(enum maynuo_m97_mode mode)
 {
-	switch(mode) {
+	switch (mode) {
 	case CC:             return "CC";
 	case CV:             return "CV";
 	case CW:             return "CP";
@@ -128,7 +128,7 @@ SR_PRIV const char *maynuo_m97_mode_to_str(enum maynuo_m97_mode mode)
 static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, float value, enum sr_mq mq, enum sr_unit unit)
 {
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 
 	analog.channels = g_slist_append(NULL, ch);
 	analog.num_samples = 1;
@@ -137,7 +137,7 @@ static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct
 	analog.unit = unit;
 	analog.mqflags = SR_MQFLAG_DC;
 
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
 	sr_session_send(sdi, &packet);
 	g_slist_free(analog.channels);
@@ -178,7 +178,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
 	devc->expecting_registers = 0;
 	if (sr_modbus_read_holding_registers(modbus, -1, 4, registers) == SR_OK) {
 		packet.type = SR_DF_FRAME_BEGIN;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 
 		maynuo_m97_session_send_value(sdi, sdi->channels->data,
 		                              RBFL(registers + 0),
@@ -188,13 +188,13 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
 		                              SR_MQ_CURRENT, SR_UNIT_AMPERE);
 
 		packet.type = SR_DF_FRAME_END;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		devc->num_samples++;
 	}
 
 	if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
 		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sdi->driver->dev_acquisition_stop(sdi);
 		return TRUE;
 	}
 
@@ -202,7 +202,7 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
 		t = (g_get_monotonic_time() - devc->starttime) / 1000;
 		if (t > (int64_t)devc->limit_msec) {
 			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sdi->driver->dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 	}