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 417745bbc48bbf80bd59bc1d00fd935f67995fa8..7dbb9ca6cbe20f10088a87d3f98b18dfa4b17e5b 100644 (file)
--- 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 a987e3f35be512e814fd5cdc62b2712cbef217fa..de89f7acc947e91abeef0ff864039e00cb9b2981 100644 (file)
--- 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 ad2698f68c85015427dbb4ad5fd47daa98a4d435..e5e1372a95b308089fa8fb68b18e31fba79d23bb 100644 (file)
--- 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 825fcea9097f467f1308524ef10254da5752c209..0811cbf3b5ff52002af139991e46cc0e8def3313 100644 (file)
--- 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 1c371cac06b2775c1ea025e982f669730b7c1d2b..180c8351e1b94a7ead73ab31ba0f597de8d0be2e 100644 (file)
--- 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 d74a12f0fb5057d91bd5448f3bd41157247edd73..7b1a75a31b32236f3dac4722c46b120920be3c43 100644 (file)
--- 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 8ac45afca529bac29489faab7ff48afd5fc459f2..4f62ca4b11795b23f4ed6d53ac6b006cbd9c5a2a 100644 (file)
--- 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 017fa7ba2f3ba520706aeae43b96b9780d0e8e36..c73efaed908b76e0067e5cc6131aa0fdaf950268 100644 (file)
--- 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 101a2f9f5e466fe41bf7811e151683f37c66c52a..b7c4aaf5b0fbb1b9c2bddeb7372f785d7b55bc51 100644 (file)
--- 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);