X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fprotocol.c;h=0d65f8696138f577570f3ed893c863ef58f311da;hb=16544b38567ce7fa309c1b7da886f3c0c85b1e29;hp=a969e9763cd1f19a8e205147bcbe664c1ca66148;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/protocol.c b/src/hardware/atten-pps3xxx/protocol.c
index a969e976..0d65f869 100644
--- a/src/hardware/atten-pps3xxx/protocol.c
+++ b/src/hardware/atten-pps3xxx/protocol.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "protocol.h"
 
-static void dump_packet(char *msg, uint8_t *packet)
+static void dump_packet(const char *msg, uint8_t *packet)
 {
 	int i;
 	char str[128];
@@ -37,37 +37,43 @@ static void handle_packet(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog_old analog;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	float value, data[MAX_CHANNELS];
 	int offset, i;
 
 	devc = sdi->priv;
 	dump_packet("received", devc->packet);
-	packet.type = SR_DF_ANALOG_OLD;
+
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
+	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
-	analog.channels = sdi->channels;
+	analog.meaning->channels = sdi->channels;
 	analog.num_samples = 1;
 
-	analog.mq = SR_MQ_VOLTAGE;
-	analog.unit = SR_UNIT_VOLT;
-	analog.mqflags = SR_MQFLAG_DC;
+	analog.meaning->mq = SR_MQ_VOLTAGE;
+	analog.meaning->unit = SR_UNIT_VOLT;
+	analog.meaning->mqflags = SR_MQFLAG_DC;
 	analog.data = data;
 	for (i = 0; i < devc->model->num_channels; i++) {
 		offset = 2 + i * 4;
 		value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 100.0;
-		analog.data[i] = value;
+		((float *)analog.data)[i] = value;
 		devc->config[i].output_voltage_last = value;
 	}
 	sr_session_send(sdi, &packet);
 
-	analog.mq = SR_MQ_CURRENT;
-	analog.unit = SR_UNIT_AMPERE;
-	analog.mqflags = 0;
+	analog.meaning->mq = SR_MQ_CURRENT;
+	analog.meaning->unit = SR_UNIT_AMPERE;
+	analog.meaning->mqflags = 0;
 	analog.data = data;
 	for (i = 0; i < devc->model->num_channels; i++) {
 		offset = 4 + i * 4;
 		value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 1000.0;
-		analog.data[i] = value;
+		((float *)analog.data)[i] = value;
 		devc->config[i].output_current_last = value;
 	}
 	sr_session_send(sdi, &packet);
@@ -133,7 +139,6 @@ SR_PRIV int atten_pps3xxx_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	const struct sr_dev_inst *sdi;
 	struct sr_serial_dev_inst *serial;
-	struct sr_datafeed_packet packet;
 	unsigned char c;
 
 	(void)fd;
@@ -156,8 +161,7 @@ SR_PRIV int atten_pps3xxx_receive_data(int fd, int revents, void *cb_data)
 				send_config(sdi);
 			else {
 				serial_source_remove(sdi->session, serial);
-				packet.type = SR_DF_END;
-				sr_session_send(sdi, &packet);
+				std_session_send_df_end(sdi);
 			}
 		}
 	}