X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsiglent-sds%2Fapi.c;h=846399b678c4a8a3af56864e99ffbf27173b9d87;hb=7047acc8e85b38713450e800037dbcddb1fa98ac;hp=4cecce03b3d29685be4711b3982c6b85b58933a7;hpb=827139ef49bf0e2eab33beed8da2f1a4ce7c5a3b;p=libsigrok.git

diff --git a/src/hardware/siglent-sds/api.c b/src/hardware/siglent-sds/api.c
index 4cecce03..846399b6 100644
--- a/src/hardware/siglent-sds/api.c
+++ b/src/hardware/siglent-sds/api.c
@@ -229,7 +229,7 @@ static const struct siglent_sds_model supported_models[] = {
 	{ SERIES(SDS2000X), "SDS2304X", { 2, 1000000000 }, 4, FALSE, 0 },
 };
 
-SR_PRIV struct sr_dev_driver siglent_sds_driver_info;
+static struct sr_dev_driver siglent_sds_driver_info;
 
 static void clear_helper(void *priv)
 {
@@ -257,10 +257,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	const struct siglent_sds_model *model;
 	gchar *channel_name;
 
-	sr_dbg("Setting Communication Headers to off.");
-	if (sr_scpi_send(scpi, "CHDR OFF") != SR_OK)
-		return NULL;
-
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
 		sr_info("Couldn't get IDN response, retrying.");
 		sr_scpi_close(scpi);
@@ -284,6 +280,10 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		return NULL;
 	}
 
+	sr_dbg("Setting Communication Headers to off.");
+	if (sr_scpi_send(scpi, "CHDR OFF") != SR_OK)
+		return NULL;
+
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->vendor = g_strdup(model->series->vendor->name);
 	sdi->model = g_strdup(model->name);
@@ -799,7 +799,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct sr_scpi_dev_inst *scpi;
 	struct dev_context *devc;
 	struct sr_channel *ch;
-	struct sr_datafeed_packet packet;
 	gboolean some_digital;
 	GSList *l, *d;
 
@@ -900,8 +899,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 
 	/* Start of first frame. */
-	packet.type = SR_DF_FRAME_BEGIN;
-	sr_session_send(sdi, &packet);
+	std_session_send_df_frame_begin(sdi);
 
 	return SR_OK;
 }
@@ -923,7 +921,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
+static struct sr_dev_driver siglent_sds_driver_info = {
 	.name = "siglent-sds",
 	.longname = "Siglent SDS1000/SDS2000",
 	.api_version = 1,
@@ -941,5 +939,4 @@ SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(siglent_sds_driver_info);