From: Uwe Hermann <redacted>
Date: Sat, 29 Jan 2011 16:10:24 +0000 (+0100)
Subject: Add a field for the full name of a device.
X-Git-Tag: libsigrok-0.1.0~366
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=9f8274a544865838f880c4849c28b6129141cf99;p=libsigrok.git

Add a field for the full name of a device.

Also, show this long/full name in 'sigrok-cli -V'.
---

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 417745bb..7dbb9ca6 100644
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -357,6 +357,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin alsa_plugin_info = {
 	"alsa",
+	"ALSA driver",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index a987e3f3..de89f7ac 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -1351,6 +1351,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin asix_sigma_plugin_info = {
 	"asix-sigma",
+	"ASIX SIGMA",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/hardware/common/skeleton.c b/hardware/common/skeleton.c
index ad2698f6..e5e1372a 100644
--- a/hardware/common/skeleton.c
+++ b/hardware/common/skeleton.c
@@ -61,6 +61,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin skeleton_plugin_info = {
 	"skeleton",
+	"Skeleton driver",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 825fcea9..0811cbf3 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -392,6 +392,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin demo_plugin_info = {
 	"demo",
+	"Demo driver and pattern generator",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 1c371cac..180c8351 100644
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -752,10 +752,10 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin link_mso19_plugin_info = {
 	.name = "link-mso19",
+	.longname = "Link Instruments MSO-19",
 	.api_version = 1,
 	.init = hw_init,
 	.cleanup = hw_cleanup,
-
 	.open = hw_opendev,
 	.close = hw_closedev,
 	.get_device_info = hw_get_device_info,
diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index d74a12f0..7b1a75a3 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -791,6 +791,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin ols_plugin_info = {
 	"ols",
+	"Openbench Logic Sniffer",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index 8ac45afc..4f62ca4b 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -742,10 +742,10 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin saleae_logic_plugin_info = {
 	"saleae-logic",
+	"Saleae Logic",
 	1,
 	hw_init,
 	hw_cleanup,
-
 	hw_opendev,
 	hw_closedev,
 	hw_get_device_info,
diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 017fa7ba..c73efaed 100644
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -562,6 +562,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 
 struct device_plugin zeroplus_logic_cube_plugin_info = {
 	"zeroplus-logic-cube",
+	"Zeroplus Logic Cube LAP-C series",
 	1,
 	hw_init,
 	hw_cleanup,
diff --git a/sigrok.h b/sigrok.h
index 101a2f9f..b7c4aaf5 100644
--- a/sigrok.h
+++ b/sigrok.h
@@ -315,6 +315,7 @@ struct samplerates {
 struct device_plugin {
 	/* Plugin-specific */
 	char *name;
+	char *longname;
 	int api_version;
 	int (*init) (char *deviceinfo);
 	void (*cleanup) (void);