From: Soeren Apel <redacted>
Date: Sat, 25 Feb 2017 16:46:00 +0000 (+0100)
Subject: lecroy-xstream: Don't send custom SCPI command to the probed device
X-Git-Tag: libsigrok-0.5.0~109
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d0b913eac47d8a1dc38ce84315b57f896bcf8c82;p=libsigrok.git

lecroy-xstream: Don't send custom SCPI command to the probed device
---

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index bd84a0bc..f3b4c903 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -53,7 +53,6 @@ static struct sr_dev_inst *probe_serial_device(struct sr_scpi_dev_inst *scpi)
 	devc = NULL;
 	hw_info = NULL;
 
-	sr_scpi_send(scpi, "COMM_HEADER OFF,WORD,BIN");
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
 		sr_info("Couldn't get IDN response.");
 		goto fail;
diff --git a/src/hardware/lecroy-xstream/protocol.c b/src/hardware/lecroy-xstream/protocol.c
index e3152623..13a7191a 100644
--- a/src/hardware/lecroy-xstream/protocol.c
+++ b/src/hardware/lecroy-xstream/protocol.c
@@ -528,6 +528,9 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
 	if (!(devc->model_state = scope_state_new(devc->model_config)))
 		return SR_ERR_MALLOC;
 
+	/* Set the desired response mode. */
+	sr_scpi_send(sdi->conn, "COMM_HEADER OFF,WORD,BIN");
+
 	return SR_OK;
 }