X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi.c;h=4f72d6e65e01bfc5853efa0cc2cd5615f5676952;hb=16a8e58068a725abd9a8b516c56e7cebe853cc75;hp=a01e13e037da3575b37c42e935dc5cb91e932cdd;hpb=a019bc48fd683667ee32e33d872b5d7037a16acf;p=libsigrok.git

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index a01e13e0..4f72d6e6 100644
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -31,12 +31,13 @@
 #define SCPI_READ_RETRY_TIMEOUT_US (10 * 1000)
 
 static const char *scpi_vendors[][2] = {
-	{ "HEWLETT-PACKARD", "HP" },
 	{ "Agilent Technologies", "Agilent" },
-	{ "RIGOL TECHNOLOGIES", "Rigol" },
-	{ "PHILIPS", "Philips" },
 	{ "CHROMA", "Chroma" },
 	{ "Chroma ATE", "Chroma" },
+	{ "HEWLETT-PACKARD", "HP" },
+	{ "Keysight Technologies", "Keysight" },
+	{ "PHILIPS", "Philips" },
+	{ "RIGOL TECHNOLOGIES", "Rigol" },
 };
 
 /**
@@ -406,6 +407,21 @@ SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi)
 	return scpi->open(scpi);
 }
 
+/**
+ * Get the connection ID of the SCPI device.
+ *
+ * @param scpi Previously initialized SCPI device structure.
+ * @param connection_id Pointer where to store the connection ID. The caller
+ *        is responsible for g_free()ing the string when it is no longer needed.
+ *
+ * @return SR_OK on success, SR_ERR on failure.
+ */
+SR_PRIV int sr_scpi_connection_id(struct sr_scpi_dev_inst *scpi,
+		char **connection_id)
+{
+	return scpi->connection_id(scpi, connection_id);
+}
+
 /**
  * Add an event source for an SCPI device.
  *
@@ -1091,9 +1107,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 	 * model, serial number of the instrument and the firmware version.
 	 */
 	tokens = g_strsplit(response, ",", 0);
-
-	for (num_tokens = 0; tokens[num_tokens] != NULL; num_tokens++);
-
+	num_tokens = g_strv_length(tokens);
 	if (num_tokens < 4) {
 		sr_dbg("IDN response not according to spec: %80.s.", response);
 		g_strfreev(tokens);