BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drivers: Make per-driver sr_dev_driver structs static.

This commit is contained in:
Uwe Hermann 2018-12-20 08:52:51 +01:00
parent 3aadf5c479
commit 3f34a40268
8 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/hantek-4032l/api.c
View File

@ -167,7 +167,7 @@ static const uint64_t samplerates_hw[] = {
SR_MHZ(320), 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) 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); 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", .name = "hantek-4032l",
.longname = "Hantek 4032L", .longname = "Hantek 4032L",
.api_version = 1, .api_version = 1,

5
src/hardware/hp-3478a/api.c
View File

@ -54,7 +54,7 @@ static const struct {
{SR_MQ_RESISTANCE, SR_MQFLAG_FOUR_WIRE | SR_MQFLAG_AUTORANGE}, {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) 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; 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", .name = "hp-3478a",
.longname = "HP 3478A", .longname = "HP 3478A",
.api_version = 1, .api_version = 1,
@ -266,5 +266,4 @@ SR_PRIV struct sr_dev_driver hp_3478a_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };
SR_REGISTER_DEV_DRIVER(hp_3478a_driver_info); SR_REGISTER_DEV_DRIVER(hp_3478a_driver_info);

5
src/hardware/ipdbg-la/api.c
View File

@ -42,8 +42,6 @@ static const int32_t trigger_matches[] = {
SR_TRIGGER_EDGE, 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, static void ipdbg_la_split_addr_port(const char *conn, char **addr,
char **port) char **port)
{ {
@ -276,7 +274,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
return SR_OK; 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", .name = "ipdbg-la",
.longname = "IPDBG LA", .longname = "IPDBG LA",
.api_version = 1, .api_version = 1,
@ -294,5 +292,4 @@ SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };
SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info); SR_REGISTER_DEV_DRIVER(ipdbg_la_driver_info);

2
src/hardware/pipistrello-ols/api.c
View File

@ -636,7 +636,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
return SR_OK; 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", .name = "p-ols",
.longname = "Pipistrello OLS", .longname = "Pipistrello OLS",
.api_version = 1, .api_version = 1,

5
src/hardware/rohde-schwarz-sme-0x/api.c
View File

@ -24,7 +24,7 @@
#include "protocol.h" #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"; 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); 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", .name = "rohde-schwarz-sme-0x",
.longname = "Rohde&Schwarz SME-0x", .longname = "Rohde&Schwarz SME-0x",
.api_version = 1, .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, .dev_acquisition_stop = std_serial_dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };
SR_REGISTER_DEV_DRIVER(rohde_schwarz_sme_0x_driver_info); SR_REGISTER_DEV_DRIVER(rohde_schwarz_sme_0x_driver_info);

5
src/hardware/saleae-logic-pro/api.c
View File

@ -26,8 +26,6 @@
#define BUF_SIZE (16 * 1024) #define BUF_SIZE (16 * 1024)
#define BUF_TIMEOUT 1000 #define BUF_TIMEOUT 1000
SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
static const uint32_t scanopts[] = { static const uint32_t scanopts[] = {
SR_CONF_CONN, SR_CONF_CONN,
}; };
@ -459,7 +457,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
return SR_OK; 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", .name = "saleae-logic-pro",
.longname = "Saleae Logic Pro", .longname = "Saleae Logic Pro",
.api_version = 1, .api_version = 1,
@ -477,5 +475,4 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };
SR_REGISTER_DEV_DRIVER(saleae_logic_pro_driver_info); SR_REGISTER_DEV_DRIVER(saleae_logic_pro_driver_info);

5
src/hardware/siglent-sds/api.c
View File

@ -229,7 +229,7 @@ static const struct siglent_sds_model supported_models[] = {
{ SERIES(SDS2000X), "SDS2304X", { 2, 1000000000 }, 4, FALSE, 0 }, { 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) static void clear_helper(void *priv)
{ {
@ -923,7 +923,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
return SR_OK; 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", .name = "siglent-sds",
.longname = "Siglent SDS1000/SDS2000", .longname = "Siglent SDS1000/SDS2000",
.api_version = 1, .api_version = 1,
@ -941,5 +941,4 @@ SR_PRIV struct sr_dev_driver siglent_sds_driver_info = {
.dev_acquisition_stop = dev_acquisition_stop, .dev_acquisition_stop = dev_acquisition_stop,
.context = NULL, .context = NULL,
}; };
SR_REGISTER_DEV_DRIVER(siglent_sds_driver_info); SR_REGISTER_DEV_DRIVER(siglent_sds_driver_info);

2
src/hardware/zketech-ebd-usb/api.c
View File

@ -214,7 +214,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
return std_serial_dev_acquisition_stop(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", .name = "zketech-ebd-usb",
.longname = "ZKETECH EBD-USB", .longname = "ZKETECH EBD-USB",
.api_version = 1, .api_version = 1,