X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fprotocol.c;h=03fbf25210f5d91da339f52e2af054875a6229e0;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=ceaf9d72d34cce64760d0bdc95ab5df6ae95ac99;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c
index ceaf9d72..03fbf252 100644
--- a/src/hardware/lascar-el-usb/protocol.c
+++ b/src/hardware/lascar-el-usb/protocol.c
@@ -387,7 +387,10 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 {
 	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;
 	struct sr_channel *ch;
 	float *temp, *rh;
 	uint16_t s;
@@ -395,15 +398,18 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 
 	devc = sdi->priv;
 
+	/* Note: digits/spec_digits will be overridden later. */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
 	samples = buflen / devc->sample_size;
 	samples_left = devc->logged_samples - devc->rcvd_samples;
 	if (samples_left < samples)
 		samples = samples_left;
 	switch (devc->profile->logformat) {
 	case LOG_TEMP_RH:
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		analog.mqflags = 0;
+		analog.meaning->mqflags = 0;
 		if (!(temp = g_try_malloc(sizeof(float) * samples)))
 			break;
 		if (!(rh = g_try_malloc(sizeof(float) * samples)))
@@ -427,45 +433,52 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 
 		ch = sdi->channels->data;
 		if (ch->enabled) {
-			analog.channels = g_slist_append(NULL, ch);
-			analog.mq = SR_MQ_TEMPERATURE;
-			if (devc->temp_unit == 1)
-				analog.unit = SR_UNIT_FAHRENHEIT;
-			else
-				analog.unit = SR_UNIT_CELSIUS;
-			analog.data = temp;
+			analog.meaning->channels = g_slist_append(NULL, ch);
+			analog.meaning->mq = SR_MQ_TEMPERATURE;
+			if (devc->temp_unit == 1) {
+				analog.meaning->unit = SR_UNIT_FAHRENHEIT;
+				analog.encoding->digits = 0;
+				analog.spec->spec_digits = 0;
+			} else {
+				analog.meaning->unit = SR_UNIT_CELSIUS;
+				analog.encoding->digits = 1;
+				analog.spec->spec_digits = 1;
+			}
+			analog.data = (void *)temp;
 			sr_session_send(sdi, &packet);
-			g_slist_free(analog.channels);
+			g_slist_free(analog.meaning->channels);
 		}
 
 		ch = sdi->channels->next->data;
 		if (ch->enabled) {
-			analog.channels = g_slist_append(NULL, ch);
-			analog.mq = SR_MQ_RELATIVE_HUMIDITY;
-			analog.unit = SR_UNIT_PERCENTAGE;
-			analog.data = rh;
+			analog.meaning->channels = g_slist_append(NULL, ch);
+			analog.meaning->mq = SR_MQ_RELATIVE_HUMIDITY;
+			analog.meaning->unit = SR_UNIT_PERCENTAGE;
+			analog.encoding->digits = 1;
+			analog.spec->spec_digits = 1;
+			analog.data = (void *)rh;
 			sr_session_send(sdi, &packet);
-			g_slist_free(analog.channels);
+			g_slist_free(analog.meaning->channels);
 		}
 
 		g_free(temp);
 		g_free(rh);
 		break;
 	case LOG_CO:
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		analog.channels = sdi->channels;
+		analog.meaning->channels = sdi->channels;
 		analog.num_samples = samples;
-		analog.mq = SR_MQ_CARBON_MONOXIDE;
-		analog.unit = SR_UNIT_CONCENTRATION;
-		analog.mqflags = 0;
+		analog.meaning->mq = SR_MQ_CARBON_MONOXIDE;
+		analog.meaning->unit = SR_UNIT_CONCENTRATION;
+		analog.meaning->mqflags = 0;
 		if (!(analog.data = g_try_malloc(sizeof(float) * samples)))
 			break;
 		for (i = 0; i < samples; i++) {
 			s = (buf[i * 2] << 8) | buf[i * 2 + 1];
-			analog.data[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
-			if (analog.data[i] < 0.0)
-				analog.data[i] = 0.0;
+			((float *)analog.data)[i] = (s * devc->co_high + devc->co_low) / (1000 * 1000);
+			if (((float *)analog.data)[i] < 0.0)
+				((float *)analog.data)[i] = 0.0;
 		}
 		sr_session_send(sdi, &packet);
 		g_free(analog.data);
@@ -491,7 +504,7 @@ SR_PRIV int lascar_el_usb_handle_events(int fd, int revents, void *cb_data)
 
 	if (sdi->status == SR_ST_STOPPING) {
 		usb_source_remove(sdi->session, drvc->sr_ctx);
-		std_session_send_df_end(sdi, LOG_PREFIX);
+		std_session_send_df_end(sdi);
 	}
 
 	memset(&tv, 0, sizeof(struct timeval));
@@ -515,7 +528,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 	switch (transfer->status) {
 	case LIBUSB_TRANSFER_NO_DEVICE:
 		/* USB device was unplugged. */
-		dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 		return;
 	case LIBUSB_TRANSFER_COMPLETED:
 	case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */
@@ -534,7 +547,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 				devc->rcvd_bytes, devc->log_size,
 				devc->rcvd_samples, devc->logged_samples);
 		if (devc->rcvd_bytes >= devc->log_size)
-			dev_acquisition_stop(sdi);
+			sr_dev_acquisition_stop(sdi);
 	}
 
 	if (sdi->status == SR_ST_ACTIVE) {
@@ -544,7 +557,7 @@ SR_PRIV void LIBUSB_CALL lascar_el_usb_receive_transfer(struct libusb_transfer *
 			       libusb_error_name(ret));
 			g_free(transfer->buffer);
 			libusb_free_transfer(transfer);
-			dev_acquisition_stop(sdi);
+			sr_dev_acquisition_stop(sdi);
 		}
 	} else {
 		/* This was the last transfer we're going to receive, so