X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgwinstek-gds-800%2Fprotocol.c;h=962bfe05467222431049bbcb178bc47318d5c5e0;hb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;hp=723b421231342ad853f8f7bb9b904379f0551252;hpb=6c1c13cdcdee4e5566bc0c2ef0ba9a1f59d2c846;p=libsigrok.git

diff --git a/src/hardware/gwinstek-gds-800/protocol.c b/src/hardware/gwinstek-gds-800/protocol.c
index 723b4212..962bfe05 100644
--- a/src/hardware/gwinstek-gds-800/protocol.c
+++ b/src/hardware/gwinstek-gds-800/protocol.c
@@ -35,7 +35,7 @@ static int read_data(struct sr_dev_inst *sdi,
 		data_size - devc->cur_rcv_buffer_position);
 	if (len < 0) {
 		sr_err("Read data error.");
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 		devc->cur_rcv_buffer_position = 0;
 		return SR_ERR;
 	}
@@ -55,7 +55,7 @@ static int read_data(struct sr_dev_inst *sdi,
 		return SR_OK;
 	} else {
 		sr_err("Too many bytes read.");
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 		devc->cur_rcv_buffer_position = 0;
 		return SR_ERR;
 	}
@@ -96,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);
+			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);
+			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);
+			sr_dev_acquisition_stop(sdi);
 			return TRUE;
 		}
 
@@ -117,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);
+				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);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			devc->state = WAIT_FOR_TRANSFER_OF_BEGIN_TRANSMISSION_COMPLETE;
@@ -135,15 +135,15 @@ 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);
+
+					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);
 					}
@@ -170,7 +170,7 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 				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);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			} else {
 				devc->data_size_digits = devc->rcv_buffer[0] - '0';
@@ -183,7 +183,7 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 			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);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			} else
 				devc->state = WAIT_FOR_TRANSFER_OF_SAMPLE_RATE_COMPLETE;
@@ -224,7 +224,7 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 					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);
+				sr_dev_acquisition_stop(sdi);
 				return TRUE;
 			}
 			volts_per_division = g_ascii_strtod(response, &end_ptr);
@@ -264,14 +264,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 acquired. */
 					sr_spew("All frames acquired.");
-					sdi->driver->dev_acquisition_stop(sdi);
+					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);
 					}