X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=259ca1690dfb4100a64dcf6d9f98bb11d8a187c5;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=442f4820ce129accb62f5318683803909f8ac971;hpb=b7b873cea33d23b8368bef067934d03eab45c76f;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 442f4820..259ca169 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -313,7 +313,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	}
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
 	sdi->vendor = g_strdup(model->series->vendor->name);
 	sdi->model = g_strdup(model->name);
 	sdi->version = g_strdup(hw_info->firmware_version);
@@ -404,10 +403,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 
 	sdi->priv = devc;
 
-	sdi->status = SR_ST_INACTIVE;
-
-	sr_scpi_close(scpi);
-
 	return sdi;
 }
 
@@ -1036,7 +1031,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
 			rigol_ds_receive, (void *)sdi);
 
-	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	devc->channel_entry = devc->enabled_channels;
@@ -1055,7 +1049,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
-	struct sr_datafeed_packet packet;
 
 	(void)cb_data;
 
@@ -1066,9 +1059,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 		return SR_ERR;
 	}
 
-	/* End of last frame. */
-	packet.type = SR_DF_END;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	g_slist_free(devc->enabled_channels);
 	devc->enabled_channels = NULL;