From: Bert Vermeulen <redacted>
Date: Mon, 20 Jan 2014 18:08:10 +0000 (+0100)
Subject: rigol-ds: Shorten vendor name.
X-Git-Tag: libsigrok-0.3.0~224
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fcdebbe89cca239c2270bea97ee709d26c51ae3b;p=libsigrok.git

rigol-ds: Shorten vendor name.
---

diff --git a/hardware/rigol-ds/api.c b/hardware/rigol-ds/api.c
index d3d5d210..52c72a44 100644
--- a/hardware/rigol-ds/api.c
+++ b/hardware/rigol-ds/api.c
@@ -163,6 +163,8 @@ static const char *data_sources[] = {
 
 #define RIGOL "Rigol Technologies"
 #define AGILENT "Agilent Technologies"
+#define RIGOL_SHORT "Rigol"
+#define AGILENT_SHORT "Agilent"
 
 static const struct rigol_ds_model supported_models[] = {
 	{RIGOL, "DS1052E", RIGOL_DS1000, PROTOCOL_IEEE488_2, {5, 1000000000}, {50, 1}, {2, 1000}, 2, false, 12},
@@ -250,7 +252,7 @@ static int probe_port(const char *resource, const char *serialcomm, GSList **dev
 	struct sr_probe *probe;
 	unsigned int i;
 	const struct rigol_ds_model *model = NULL;
-	gchar *channel_name;
+	gchar *channel_name, *vendor;
 
 	*devices = NULL;
 
@@ -278,8 +280,14 @@ static int probe_port(const char *resource, const char *serialcomm, GSList **dev
 		}
 	}
 
+	if (!strcmp(hw_info->manufacturer, RIGOL))
+		vendor = RIGOL_SHORT;
+	else if (!strcmp(hw_info->manufacturer, AGILENT))
+		vendor = AGILENT_SHORT;
+	else
+		vendor = hw_info->manufacturer;
 	if (!model || !(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
-					      hw_info->manufacturer, hw_info->model,
+					      vendor, hw_info->model,
 						  hw_info->firmware_version))) {
 		sr_scpi_hw_info_free(hw_info);
 		sr_scpi_close(scpi);