X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi.c;h=ce3cb99d2362be792549d8e1970a76ebb1b35f57;hb=3b95bd9152e6f54e259caf0909af86768c518e7a;hp=84db9daca358ea793fdb4b438504da0a4932083c;hpb=bb2a4ed407fe2986dce404244b4f2096536e2dac;p=libsigrok.git

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index 84db9dac..ce3cb99d 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -71,7 +71,7 @@ SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev;
-SR_PRIV extern const struct sr_scpi_dev_inst scpi_gpib_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_libgpib_dev;
 
 static const struct sr_scpi_dev_inst *scpi_devs[] = {
 	&scpi_tcp_raw_dev,
@@ -86,7 +86,7 @@ static const struct sr_scpi_dev_inst *scpi_devs[] = {
 	&scpi_visa_dev,
 #endif
 #ifdef HAVE_LIBGPIB
-	&scpi_gpib_dev,
+	&scpi_libgpib_dev,
 #endif
 #ifdef HAVE_LIBSERIALPORT
 	&scpi_serial_dev,  /* must be last as it matches any resource */
@@ -148,8 +148,10 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
 		for (l = resources; l; l = l->next) {
 			res = g_strsplit(l->data, ":", 2);
 			if (res[0] && (sdi = sr_scpi_scan_resource(drvc, res[0],
-			               serialcomm ? serialcomm : res[1], probe_device)))
+			               serialcomm ? serialcomm : res[1], probe_device))) {
 				devices = g_slist_append(devices, sdi);
+				sdi->connection_id = g_strdup(l->data);
+			}
 			g_strfreev(res);
 		}
 		g_slist_free_full(resources, g_free);
@@ -157,7 +159,8 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
 
 	if (!devices && resource) {
 		sdi = sr_scpi_scan_resource(drvc, resource, serialcomm, probe_device);
-		devices = g_slist_append(NULL, sdi);
+		if (sdi)
+			devices = g_slist_append(NULL, sdi);
 	}
 
 	/* Tack a copy of the newly found devices onto the driver list. */
@@ -182,6 +185,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
 			scpi = g_malloc(sizeof(*scpi));
 			*scpi = *scpi_dev;
 			scpi->priv = g_malloc0(scpi->priv_size);
+			scpi->read_timeout_ms = 1000;
 			params = g_strsplit(resource, "/", 0);
 			if (scpi->dev_inst_new(scpi->priv, drvc, resource,
 			                       params, serialcomm) != SR_OK) {
@@ -379,6 +383,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	char buf[256];
 	int len;
 	GString *response;
+	gint64 laststart;
+	unsigned int elapsed_ms;
 
 	if (command)
 		if (sr_scpi_send(scpi, command) != SR_OK)
@@ -387,6 +393,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	if (sr_scpi_read_begin(scpi) != SR_OK)
 		return SR_ERR;
 
+	laststart = g_get_monotonic_time();
+
 	response = g_string_new("");
 
 	*scpi_response = NULL;
@@ -394,20 +402,33 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	while (!sr_scpi_read_complete(scpi)) {
 		len = sr_scpi_read_data(scpi, buf, sizeof(buf));
 		if (len < 0) {
+			sr_err("Incompletely read SCPI response.");
 			g_string_free(response, TRUE);
 			return SR_ERR;
+		} else if (len > 0) {
+		        laststart = g_get_monotonic_time();
 		}
 		g_string_append_len(response, buf, len);
+		elapsed_ms = (g_get_monotonic_time() - laststart) / 1000;
+		if (elapsed_ms >= scpi->read_timeout_ms) {
+			sr_err("Timed out waiting for SCPI response.");
+			g_string_free(response, TRUE);
+			return SR_ERR;
+		}
 	}
 
 	/* Get rid of trailing linefeed if present */
 	if (response->len >= 1 && response->str[response->len - 1] == '\n')
 		g_string_truncate(response, response->len - 1);
 
+	/* Get rid of trailing carriage return if present */
+	if (response->len >= 1 && response->str[response->len - 1] == '\r')
+		g_string_truncate(response, response->len - 1);
+
 	*scpi_response = response->str;
 	g_string_free(response, FALSE);
 
-	sr_spew("Got response: '%.70s'.", *scpi_response);
+	sr_spew("Got response: '%.70s', length %d.", *scpi_response, strlen(*scpi_response));
 
 	return SR_OK;
 }
@@ -723,12 +744,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 	}
 	g_free(response);
 
-	hw_info = g_try_malloc(sizeof(struct sr_scpi_hw_info));
-	if (!hw_info) {
-		g_strfreev(tokens);
-		return SR_ERR_MALLOC;
-	}
-
+	hw_info = g_malloc0(sizeof(struct sr_scpi_hw_info));
 	hw_info->manufacturer = g_strdup(tokens[0]);
 	hw_info->model = g_strdup(tokens[1]);
 	hw_info->serial_number = g_strdup(tokens[2]);