X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffluke-45%2Fapi.c;h=96c8a1b324081507b8a07d64d80fec4c3f358506;hb=204dd31fa1074a78fbe3bf04208776a4a3615a1c;hp=9e045f0763b5e967c5e9ed9b4aa9094ffa6daadf;hpb=71db2d4d06c2d7dd52cfda2d737120ef8648afd5;p=libsigrok.git

diff --git a/src/hardware/fluke-45/api.c b/src/hardware/fluke-45/api.c
index 9e045f07..96c8a1b3 100644
--- a/src/hardware/fluke-45/api.c
+++ b/src/hardware/fluke-45/api.c
@@ -31,12 +31,6 @@
 #include "scpi.h"
 #include "protocol.h"
 
-/*
- * This test violates the SCPI protocol, and confuses other devices.
- * Disable it for now, until a better location was found.
- */
-#define ECHO_TEST 0
-
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
@@ -68,29 +62,15 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	unsigned int i;
 	const struct fluke_scpi_dmm_model *model = NULL;
 	gchar *channel_name;
-#if ECHO_TEST
-	char *response;
-#endif
-
-	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->conn = scpi;
-
-#if ECHO_TEST
-	/* Test for serial port ECHO enabled. */
-	response = NULL;
-	sr_scpi_get_string(scpi, "ECHO-TEST", &response);
-	if (response && strcmp(response, "ECHO-TEST") == 0) {
-		sr_err("Serial port ECHO is ON. Please turn it OFF!");
-		return NULL;
-	}
-#endif
 
 	/* Get device IDN. */
 	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+		sr_scpi_hw_info_free(hw_info);
 		sr_info("Couldn't get IDN response, retrying.");
 		sr_scpi_close(scpi);
 		sr_scpi_open(scpi);
 		if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
+			sr_scpi_hw_info_free(hw_info);
 			sr_info("Couldn't get IDN response.");
 			return NULL;
 		}
@@ -111,6 +91,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	}
 
 	/* Set up device parameters. */
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->vendor = g_strdup(model->vendor);
 	sdi->model = g_strdup(model->model);
 	sdi->version = g_strdup(hw_info->firmware_version);
@@ -118,10 +99,12 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	sdi->conn = scpi;
 	sdi->driver = &fluke_45_driver_info;
 	sdi->inst_type = SR_INST_SCPI;
+	sr_scpi_hw_info_free(hw_info);
 
 	devc = g_malloc0(sizeof(struct dev_context));
 	devc->num_channels = model->num_channels;
 	devc->cmdset = cmdset;
+	sdi->priv = devc;
 
 	/* Create channels. */
 	for (i = 0; i < devc->num_channels; i++) {
@@ -129,8 +112,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, channel_name);
 	}
 
-	sdi->priv = devc;
-
 	return sdi;
 }