X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgwinstek-gds-800%2Fprotocol.c;h=5feb25b140d716d336bb87e0d09fb721515a8674;hb=7f0463840ab5d6a85daaa76850558d2b71e596cf;hp=358e962a54df7c2fa3f65cf5048cb20b7dac5496;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/hardware/gwinstek-gds-800/protocol.c b/src/hardware/gwinstek-gds-800/protocol.c
index 358e962a..5feb25b1 100644
--- a/src/hardware/gwinstek-gds-800/protocol.c
+++ b/src/hardware/gwinstek-gds-800/protocol.c
@@ -18,12 +18,13 @@
  */
 
 #include "protocol.h"
+#include <math.h>
 #include <string.h>
 
 #define ANALOG_CHANNELS 2
 #define VERTICAL_DIVISIONS 10
 
-static int read_data(struct sr_dev_inst *sdi, void *cb_data,
+static int read_data(struct sr_dev_inst *sdi,
 		struct sr_scpi_dev_inst *scpi, struct dev_context *devc,
 		int data_size)
 {
@@ -34,7 +35,7 @@ static int read_data(struct sr_dev_inst *sdi, void *cb_data,
 		data_size - devc->cur_rcv_buffer_position);
 	if (len < 0) {
 		sr_err("Read data error.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sr_dev_acquisition_stop(sdi);
 		devc->cur_rcv_buffer_position = 0;
 		return SR_ERR;
 	}
@@ -54,7 +55,7 @@ static int read_data(struct sr_dev_inst *sdi, void *cb_data,
 		return SR_OK;
 	} else {
 		sr_err("Too many bytes read.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sr_dev_acquisition_stop(sdi);
 		devc->cur_rcv_buffer_position = 0;
 		return SR_ERR;
 	}
@@ -66,7 +67,10 @@ SR_PRIV int gwinstek_gds_800_receive_data(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_old analog;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	char command[32];
 	char *response;
 	float volts_per_division;
@@ -92,17 +96,17 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 	case START_ACQUISITION:
 		if (sr_scpi_send(scpi, ":TRIG:MOD 3") != SR_OK) {
 			sr_err("Failed to set trigger mode to SINGLE.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sr_dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 		if (sr_scpi_send(scpi, ":STOP") != SR_OK) {
 			sr_err("Failed to put the trigger system into STOP state.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sr_dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 		if (sr_scpi_send(scpi, ":RUN") != SR_OK) {
 			sr_err("Failed to put the trigger system into RUN state.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			sr_dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 
@@ -113,12 +117,12 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 		if (((struct sr_channel *)g_slist_nth_data(sdi->channels, devc->cur_acq_channel))->enabled) {
 			if (sr_scpi_send(scpi, ":ACQ%d:MEM?", devc->cur_acq_channel+1) != SR_OK) {
 				sr_err("Failed to acquire memory.");
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			if (sr_scpi_read_begin(scpi) != SR_OK) {
 				sr_err("Could not begin reading SCPI response.");
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			devc->state = WAIT_FOR_TRANSFER_OF_BEGIN_TRANSMISSION_COMPLETE;
@@ -131,17 +135,14 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 				if (devc->cur_acq_frame == devc->frame_limit - 1) {
 					/* All frames accquired. */
 					sr_spew("All frames acquired.");
-					
-					sdi->driver->dev_acquisition_stop(sdi, cb_data);
+
+					sr_dev_acquisition_stop(sdi);
 					return TRUE;
 				} else {
 					/* Start acquiring next frame. */
 					if (devc->df_started) {
-						packet.type = SR_DF_FRAME_END;
-						sr_session_send(sdi, &packet);
-						
-						packet.type = SR_DF_FRAME_BEGIN;
-						sr_session_send(sdi, &packet);
+						std_session_send_df_frame_end(sdi);
+						std_session_send_df_frame_begin(sdi);
 					}
 
 					devc->cur_acq_frame++;
@@ -154,127 +155,127 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 		}
 		break;
 	case WAIT_FOR_TRANSFER_OF_BEGIN_TRANSMISSION_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, 1) == SR_OK) {
-			if (devc->rcv_buffer[0] == '#')
-				devc->state = WAIT_FOR_TRANSFER_OF_DATA_SIZE_DIGIT_COMPLETE;
-		}
+		if (read_data(sdi, scpi, devc, 1) < 0)
+			break;
+		if (devc->rcv_buffer[0] == '#')
+			devc->state = WAIT_FOR_TRANSFER_OF_DATA_SIZE_DIGIT_COMPLETE;
 		break;
 	case WAIT_FOR_TRANSFER_OF_DATA_SIZE_DIGIT_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, 1) == SR_OK) {
-			if (devc->rcv_buffer[0] != '4' &&
-				devc->rcv_buffer[0] != '5' &&
-				devc->rcv_buffer[0] != '6') {
-				sr_err("Data size digits is not 4, 5 or 6 but "
-				       "'%c'.", devc->rcv_buffer[0]);
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
-				return TRUE;
-			} else {
-				devc->data_size_digits = devc->rcv_buffer[0] - '0';
-				devc->state = WAIT_FOR_TRANSFER_OF_DATA_SIZE_COMPLETE;
-			}
+		if (read_data(sdi, scpi, devc, 1) < 0)
+			break;
+		if (devc->rcv_buffer[0] != '4' &&
+			devc->rcv_buffer[0] != '5' &&
+			devc->rcv_buffer[0] != '6') {
+			sr_err("Data size digits is not 4, 5 or 6 but "
+			       "'%c'.", devc->rcv_buffer[0]);
+			sr_dev_acquisition_stop(sdi);
+			return TRUE;
+		} else {
+			devc->data_size_digits = devc->rcv_buffer[0] - '0';
+			devc->state = WAIT_FOR_TRANSFER_OF_DATA_SIZE_COMPLETE;
 		}
 		break;
 	case WAIT_FOR_TRANSFER_OF_DATA_SIZE_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, devc->data_size_digits) == SR_OK) {
-			devc->rcv_buffer[devc->data_size_digits] = 0;
-			if (sr_atoi(devc->rcv_buffer, &devc->data_size) != SR_OK) {
-				sr_err("Could not parse data size '%s'", devc->rcv_buffer);
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
-				return TRUE;
-			} else
-				devc->state = WAIT_FOR_TRANSFER_OF_SAMPLE_RATE_COMPLETE;
-		}
+		if (read_data(sdi, scpi, devc, devc->data_size_digits) < 0)
+			break;
+		devc->rcv_buffer[devc->data_size_digits] = 0;
+		if (sr_atoi(devc->rcv_buffer, &devc->data_size) != SR_OK) {
+			sr_err("Could not parse data size '%s'", devc->rcv_buffer);
+			sr_dev_acquisition_stop(sdi);
+			return TRUE;
+		} else
+			devc->state = WAIT_FOR_TRANSFER_OF_SAMPLE_RATE_COMPLETE;
 		break;
 	case WAIT_FOR_TRANSFER_OF_SAMPLE_RATE_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, sizeof(float)) == SR_OK) {
-			/*
-			 * Contrary to the documentation, this field is
-			 * transfered with most significant byte first!
-			 */
-			sample_rate = RB32(devc->rcv_buffer);
-			memcpy(&devc->sample_rate, &sample_rate, sizeof(float));
-			devc->state = WAIT_FOR_TRANSFER_OF_CHANNEL_INDICATOR_COMPLETE;
+		if (read_data(sdi, scpi, devc, sizeof(float)) < 0)
+			break;
+		/*
+		 * Contrary to the documentation, this field is
+		 * transfered with most significant byte first!
+		 */
+		sample_rate = RB32(devc->rcv_buffer);
+		memcpy(&devc->sample_rate, &sample_rate, sizeof(float));
+		devc->state = WAIT_FOR_TRANSFER_OF_CHANNEL_INDICATOR_COMPLETE;
 
-			if (!devc->df_started) {
-				std_session_send_df_header(sdi, LOG_PREFIX);
-
-				packet.type = SR_DF_FRAME_BEGIN;
-				sr_session_send(sdi, &packet);
-
-				devc->df_started = TRUE;
-			}
+		if (!devc->df_started) {
+			std_session_send_df_header(sdi);
+			std_session_send_df_frame_begin(sdi);
+			devc->df_started = TRUE;
 		}
 		break;
 	case WAIT_FOR_TRANSFER_OF_CHANNEL_INDICATOR_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, 1) == SR_OK)
+		if (read_data(sdi, scpi, devc, 1) == SR_OK)
 			devc->state = WAIT_FOR_TRANSFER_OF_RESERVED_DATA_COMPLETE;
 		break;
 	case WAIT_FOR_TRANSFER_OF_RESERVED_DATA_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, 3) == SR_OK)
+		if (read_data(sdi, scpi, devc, 3) == SR_OK)
 			devc->state = WAIT_FOR_TRANSFER_OF_CHANNEL_DATA_COMPLETE;
 		break;
 	case WAIT_FOR_TRANSFER_OF_CHANNEL_DATA_COMPLETE:
-		if (read_data(sdi, cb_data, scpi, devc, devc->data_size - 8) == SR_OK) {
-			/* Fetch data needed for conversion from device. */
-			snprintf(command, sizeof(command), ":CHAN%d:SCAL?",
-					devc->cur_acq_channel + 1);
-			if (sr_scpi_get_string(scpi, command, &response) != SR_OK) {
-				sr_err("Failed to get volts per division.");
-				sdi->driver->dev_acquisition_stop(sdi, cb_data);
-				return TRUE;
-			}
-			volts_per_division = g_ascii_strtod(response, &end_ptr);
-			if (!strcmp(end_ptr, "mV"))
-				volts_per_division *= 1.e-3;
-			g_free(response);
+		if (read_data(sdi, scpi, devc, devc->data_size - 8) < 0)
+			break;
 
-			num_samples = (devc->data_size - 8) / 2;
-			sr_spew("Received %d number of samples from channel "
-				"%d.", num_samples, devc->cur_acq_channel + 1);
+		/* Fetch data needed for conversion from device. */
+		snprintf(command, sizeof(command), ":CHAN%d:SCAL?",
+				devc->cur_acq_channel + 1);
+		if (sr_scpi_get_string(scpi, command, &response) != SR_OK) {
+			sr_err("Failed to get volts per division.");
+			sr_dev_acquisition_stop(sdi);
+			return TRUE;
+		}
+		volts_per_division = g_ascii_strtod(response, &end_ptr);
+		if (!strcmp(end_ptr, "mV"))
+			volts_per_division *= 1.e-3;
+		g_free(response);
 
-			/* Convert data. */
-			for (i = 0; i < num_samples; i++)
-				samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) / 256. * VERTICAL_DIVISIONS * volts_per_division;
+		num_samples = (devc->data_size - 8) / 2;
+		sr_spew("Received %d number of samples from channel "
+			"%d.", num_samples, devc->cur_acq_channel + 1);
 
-			/* Fill frame. */
-			analog.channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel));
-			analog.num_samples = num_samples;
-			analog.data = samples;
-			analog.mq = SR_MQ_VOLTAGE;
-			analog.unit = SR_UNIT_VOLT;
-			analog.mqflags = 0;
-			packet.type = SR_DF_ANALOG_OLD;
-			packet.payload = &analog;
-			sr_session_send(cb_data, &packet);
-			g_slist_free(analog.channels);
+		float vbit = volts_per_division * VERTICAL_DIVISIONS / 256.0;
+		float vbitlog = log10f(vbit);
+		int digits = -(int)vbitlog + (vbitlog < 0.0);
 
-			/* All channels acquired. */
-			if (devc->cur_acq_channel == ANALOG_CHANNELS - 1) {
-				sr_spew("All channels acquired.");
+		/* Convert data. */
+		for (i = 0; i < num_samples; i++)
+			samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) * vbit;
 
-				if (devc->cur_acq_frame == devc->frame_limit - 1) {
-					/* All frames acquired. */
-					sr_spew("All frames acquired.");
-					sdi->driver->dev_acquisition_stop(sdi, cb_data);
-					return TRUE;
-				} else {
-					/* Start acquiring next frame. */
-					if (devc->df_started) {
-						packet.type = SR_DF_FRAME_END;
-						sr_session_send(sdi, &packet);
-						
-						packet.type = SR_DF_FRAME_BEGIN;
-						sr_session_send(sdi, &packet);
-					}
-					devc->cur_acq_frame++;
-					devc->state = START_ACQUISITION;
-				}
-			} else {
-				/* Start acquiring next channel. */
-				devc->state = START_TRANSFER_OF_CHANNEL_DATA;
-				devc->cur_acq_channel++;
+		/* Fill frame. */
+		sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+		analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel));
+		analog.num_samples = num_samples;
+		analog.data = samples;
+		analog.meaning->mq = SR_MQ_VOLTAGE;
+		analog.meaning->unit = SR_UNIT_VOLT;
+		analog.meaning->mqflags = 0;
+		packet.type = SR_DF_ANALOG;
+		packet.payload = &analog;
+		sr_session_send(sdi, &packet);
+		g_slist_free(analog.meaning->channels);
+
+		/* All channels acquired. */
+		if (devc->cur_acq_channel == ANALOG_CHANNELS - 1) {
+			sr_spew("All channels acquired.");
+
+			if (devc->cur_acq_frame == devc->frame_limit - 1) {
+				/* All frames acquired. */
+				sr_spew("All frames acquired.");
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
+			} else {
+				/* Start acquiring next frame. */
+				if (devc->df_started) {
+					std_session_send_df_frame_end(sdi);
+					std_session_send_df_frame_begin(sdi);
+				}
+				devc->cur_acq_frame++;
+				devc->state = START_ACQUISITION;
 			}
+		} else {
+			/* Start acquiring next channel. */
+			devc->state = START_TRANSFER_OF_CHANNEL_DATA;
+			devc->cur_acq_channel++;
+			return TRUE;
 		}
 		break;
 	}