drivers: Make per-driver sr_dev_driver structs static.

diff --git a/src/hardware/hantek-4032l/api.c b/src/hardware/hantek-4032l/api.c
index 6ee46dee0642972ce16bb954fdcd705d93234d38..9da338ab1cf4a8e5c63836b312587e3dc02e66cf 100644 (file)
--- a/src/hardware/hantek-4032l/api.c
+++ b/src/hardware/hantek-4032l/api.c
@@ -167,7 +167,7 @@ static const uint64_t samplerates_hw[] = {
        SR_MHZ(320),
 };
 
-SR_PRIV struct sr_dev_driver hantek_4032l_driver_info;
+static struct sr_dev_driver hantek_4032l_driver_info;
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
@@ -621,7 +621,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return h4032l_stop(sdi);
 }
 
-SR_PRIV struct sr_dev_driver hantek_4032l_driver_info = {
+static struct sr_dev_driver hantek_4032l_driver_info = {
        .name = "hantek-4032l",
        .longname = "Hantek 4032L",
        .api_version = 1,

diff --git a/src/hardware/hp-3478a/api.c b/src/hardware/hp-3478a/api.c
index c87affd3ffdecb900133c770f0683ca3716ccd97..5174ee1474a07155a9b2710120fe2d52008ad7d6 100644 (file)
--- a/src/hardware/hp-3478a/api.c
+++ b/src/hardware/hp-3478a/api.c
@@ -54,7 +54,7 @@ static const struct {
        {SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE | SR_MQFLAG_AUTORANGE},
 };
 
-SR_PRIV struct sr_dev_driver hp_3478a_driver_info;
+static struct sr_dev_driver hp_3478a_driver_info;
 
 static int create_front_channel(struct sr_dev_inst *sdi, int chan_idx)
 {
@@ -248,7 +248,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver hp_3478a_driver_info = {
+static struct sr_dev_driver hp_3478a_driver_info = {
        .name = "hp-3478a",
        .longname = "HP 3478A",
        .api_version = 1,
@@ -266,5 +266,4 @@ SR_PRIV struct sr_dev_driver hp_3478a_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(hp_3478a_driver_info);

diff --git a/src/hardware/ipdbg-la/api.c b/src/hardware/ipdbg-la/api.c
index 59f3f56e955d1313f8538605ee3b8955859c8d24..c24eb908507a9c449d60d8d126987743f2217260 100644 (file)
--- a/src/hardware/ipdbg-la/api.c
+++ b/src/hardware/ipdbg-la/api.c
@@ -42,8 +42,6 @@ static const int32_t trigger_matches[] = {
        SR_TRIGGER_EDGE,
 };
 
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info;
-
 static void ipdbg_la_split_addr_port(const char *conn, char **addr,
        char **port)
 {
@@ -276,7 +274,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
+static struct sr_dev_driver ipdbg_la_driver_info = {
        .name = "ipdbg-la",
        .longname = "IPDBG LA",
        .api_version = 1,
@@ -294,5 +292,4 @@ SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info);

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 8d8fe5a9e697500280e216e46bdb3b67d9b28a3b..a7b43c4c52f69fd677caee2504af43eac556574d 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -636,7 +636,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver p_ols_driver_info = {
+static struct sr_dev_driver p_ols_driver_info = {
        .name = "p-ols",
        .longname = "Pipistrello OLS",
        .api_version = 1,

diff --git a/src/hardware/rohde-schwarz-sme-0x/api.c b/src/hardware/rohde-schwarz-sme-0x/api.c
index 6a719e878015dd5b45baa793478f8f93e620f89f..0ca97eecaac7e3ce0be92eb53efd143c3e5bd2ed 100644 (file)
--- a/src/hardware/rohde-schwarz-sme-0x/api.c
+++ b/src/hardware/rohde-schwarz-sme-0x/api.c
@@ -24,7 +24,7 @@
 
 #include "protocol.h"
 
-SR_PRIV struct sr_dev_driver rohde_schwarz_sme_0x_driver_info;
+static struct sr_dev_driver rohde_schwarz_sme_0x_driver_info;
 
 static const char *manufacturer = "Rohde&Schwarz";
 
@@ -220,7 +220,7 @@ static int config_list(uint32_t key, GVariant **data,
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
-SR_PRIV struct sr_dev_driver rohde_schwarz_sme_0x_driver_info = {
+static struct sr_dev_driver rohde_schwarz_sme_0x_driver_info = {
        .name = "rohde-schwarz-sme-0x",
        .longname = "Rohde&Schwarz SME-0x",
        .api_version = 1,
@@ -238,5 +238,4 @@ SR_PRIV struct sr_dev_driver rohde_schwarz_sme_0x_driver_info = {
        .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(rohde_schwarz_sme_0x_driver_info);

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 7b8582d2bc614588587ffd1d805d56c80b4a9532..0a2a2728633e3cf42c9e463153c65d060aa5eb6c 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -26,8 +26,6 @@
 #define BUF_SIZE (16 * 1024)
 #define BUF_TIMEOUT 1000
 
-SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
@@ -459,7 +457,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
+static struct sr_dev_driver saleae_logic_pro_driver_info = {
        .name = "saleae-logic-pro",
        .longname = "Saleae Logic Pro",
        .api_version = 1,
@@ -477,5 +475,4 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(saleae_logic_pro_driver_info);

diff --git a/src/hardware/siglent-sds/api.c b/src/hardware/siglent-sds/api.c
index 4cecce03b3d29685be4711b3982c6b85b58933a7..76af671249cee157fb4f711eb6fe6c477f657db2 100644 (file)
--- a/src/hardware/siglent-sds/api.c
+++ b/src/hardware/siglent-sds/api.c
@@ -229,7 +229,7 @@ static const struct siglent_sds_model supported_models[] = {
        { SERIES(SDS2000X), "SDS2304X", { 2, 1000000000 }, 4, FALSE, 0 },
 };
 
-SR_PRIV struct sr_dev_driver siglent_sds_driver_info;
+static struct sr_dev_driver siglent_sds_driver_info;
 
 static void clear_helper(void *priv)
 {
@@ -923,7 +923,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
+static struct sr_dev_driver siglent_sds_driver_info = {
        .name = "siglent-sds",
        .longname = "Siglent SDS1000/SDS2000",
        .api_version = 1,
@@ -941,5 +941,4 @@ SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
-
 SR_REGISTER_DEV_DRIVER(siglent_sds_driver_info);

diff --git a/src/hardware/zketech-ebd-usb/api.c b/src/hardware/zketech-ebd-usb/api.c
index 4dbe841570673e0dbb1e1d121c395ed51c24c927..3327aff718a5295389d1d09aca0d520cca425b77 100644 (file)
--- a/src/hardware/zketech-ebd-usb/api.c
+++ b/src/hardware/zketech-ebd-usb/api.c
@@ -214,7 +214,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        return std_serial_dev_acquisition_stop(sdi);
 }
 
-SR_PRIV struct sr_dev_driver zketech_ebd_usb_driver_info = {
+static struct sr_dev_driver zketech_ebd_usb_driver_info = {
        .name = "zketech-ebd-usb",
        .longname = "ZKETECH EBD-USB",
        .api_version = 1,