sr: make struct drv_context global

diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h
index 179d0013cfb4947102a1c0350484c843344c84d0..4c8ecac4c1670d40c04ee205bde596d46329a21a 100644 (file)
--- a/hardware/agilent-dmm/agilent-dmm.h
+++ b/hardware/agilent-dmm/agilent-dmm.h
@@ -42,11 +42,6 @@ struct agdmm_profile {
        const struct agdmm_recv *recvs;
 };
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        const struct agdmm_profile *profile;

diff --git a/hardware/asix-sigma/asix-sigma.h b/hardware/asix-sigma/asix-sigma.h
index 12410238a7000e5298254b6d23edaa2619cd4fd2..85a853d5c2bacf4129b3bdf52424d990f723f14c 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.h
+++ b/hardware/asix-sigma/asix-sigma.h
@@ -173,11 +173,6 @@ struct sigma_state {
        int chunks_downloaded;
 };
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        struct ftdi_context ftdic;

diff --git a/hardware/chronovu-la8/driver.h b/hardware/chronovu-la8/driver.h
index b4aaa9009c31365d0452883ea5235536e321a40f..39e360b60c4548da3e17e715e9f9570427ab9705 100644 (file)
--- a/hardware/chronovu-la8/driver.h
+++ b/hardware/chronovu-la8/driver.h
@@ -41,11 +41,6 @@
 #define BS                             4096 /* Block size */
 #define NUM_BLOCKS                     2048 /* Number of blocks */
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        /** FTDI device context (used by libftdi). */

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index ba440a3d0289dd170fa1aa1f1823d035cd366922..e435482e32ac1c91e67aba58c1cfd452255765c9 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -63,13 +63,6 @@ enum {
        PATTERN_ALL_HIGH,
 };
 
-/* FIXME: Should not be global. */
-
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        int pipe_fds[2];

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index f599feb62c3147ef870611c598aff78fe7e28e7e..c68b4aecda0ec2cfca53e3b5e914557fd5fef78b 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -60,10 +60,6 @@ struct fx2lafw_profile {
        uint32_t dev_caps;
 };
 
-struct drv_context {
-       GSList *instances;
-};
-
 struct dev_context {
        const struct fx2lafw_profile *profile;
 

diff --git a/hardware/genericdmm/genericdmm.h b/hardware/genericdmm/genericdmm.h
index cb323e41a77d39e4091f707a335433da1fde9601..99b8619dd1da4fabd779eff0b35698fd075cb3e7 100644 (file)
--- a/hardware/genericdmm/genericdmm.h
+++ b/hardware/genericdmm/genericdmm.h
@@ -45,11 +45,6 @@ struct dev_profile {
        struct sr_hwopt *defaults_opts;
 };
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        struct dev_profile *profile;

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 800aeadcfa132e29c14277baec48b2dd2657c881..5ea970a9541a5a1142ba051c5a6f8b35e339e0be 100644 (file)
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -159,10 +159,6 @@ struct dso_profile {
        char *firmware;
 };
 
-struct drv_context {
-       GSList *instances;
-};
-
 struct dev_context {
        const struct dso_profile *profile;
        struct sr_usb_dev_inst *usb;

diff --git a/hardware/openbench-logic-sniffer/ols.h b/hardware/openbench-logic-sniffer/ols.h
index 66a45d5cba11b49481610aeaefd60533091319c9..179426858d0a011b34a069736aefb0c3873feadc 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.h
+++ b/hardware/openbench-logic-sniffer/ols.h
@@ -59,11 +59,6 @@
 #define FLAG_CLOCK_INVERTED        0x80
 #define FLAG_RLE                   0x0100
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        uint32_t max_samplerate;

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index 7f6196a80a8ee35dce602c41554b3cc482cb5b77..85555d8582b5419eb977cc893229fc88e134efb5 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -147,11 +147,6 @@ static const struct sr_samplerates samplerates = {
        supported_samplerates,
 };
 
-/* Private driver context. */
-struct drv_context {
-       GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
        uint64_t cur_samplerate;

diff --git a/libsigrok.h b/libsigrok.h
index bdc07230bd45d8f19a290fd05c670288318433e8..2a88a7d03bc891602b404221ba661f9f918f4dd3 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -533,6 +533,11 @@ struct sr_dev_driver {
        void *priv;
 };
 
+/* Private driver context. */
+struct drv_context {
+       GSList *instances;
+};
+
 struct sr_session {
        /* List of struct sr_dev* */
        GSList *devs;