X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi.c;h=bb7099786d2c21b9bc2c8170bc47cf45fb9dc8d2;hb=adfba7368ac297bba20b0afbc7d7322309508b30;hp=fbb57472b3301bb4510a622e6295d04bc0438b58;hpb=edbd09250b185950646ee5928b2e7112161168cc;p=libsigrok.git

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index fbb57472..bb709978 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -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);
@@ -183,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) {
@@ -380,6 +383,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 	char buf[256];
 	int len;
 	GString *response;
+	gint64 start;
+	unsigned int elapsed_ms;
 
 	if (command)
 		if (sr_scpi_send(scpi, command) != SR_OK)
@@ -388,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;
 
+	start = g_get_monotonic_time();
+
 	response = g_string_new("");
 
 	*scpi_response = NULL;
@@ -399,6 +406,13 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
 			return SR_ERR;
 		}
 		g_string_append_len(response, buf, len);
+		elapsed_ms = (g_get_monotonic_time() - start) / 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 */