Every single hardware driver has the very same implementation of the dev_list() callback. Put this into a helper function in the standard helper library and use it throughout the drivers. This reduces boiler-plate code by quite a bit.
Signed-off-by: Lars-Peter Clausen <[email protected]> --- src/hardware/agilent-dmm/api.c | 7 +------ src/hardware/appa-55ii/api.c | 7 +------ src/hardware/arachnid-labs-re-load-pro/api.c | 7 +------ src/hardware/asix-sigma/api.c | 7 +------ src/hardware/atten-pps3xxx/api.c | 7 +------ src/hardware/baylibre-acme/api.c | 7 +------ src/hardware/beaglelogic/api.c | 7 +------ src/hardware/brymen-bm86x/api.c | 7 +------ src/hardware/brymen-dmm/api.c | 7 +------ src/hardware/cem-dt-885x/api.c | 7 +------ src/hardware/center-3xx/api.c | 11 +---------- src/hardware/chronovu-la/api.c | 7 +------ src/hardware/colead-slm/api.c | 7 +------ src/hardware/conrad-digi-35-cpu/api.c | 7 +------ src/hardware/demo/demo.c | 7 +------ src/hardware/deree-de5000/api.c | 7 +------ src/hardware/fluke-dmm/api.c | 7 +------ src/hardware/ftdi-la/api.c | 7 +------ src/hardware/fx2lafw/api.c | 7 +------ src/hardware/gmc-mh-1x-2x/api.c | 9 ++------- src/hardware/gwinstek-gds-800/api.c | 7 +------ src/hardware/hameg-hmo/api.c | 7 +------ src/hardware/hantek-6xxx/api.c | 7 +------ src/hardware/hantek-dso/api.c | 7 +------ src/hardware/hp-3457a/api.c | 7 +------ src/hardware/hung-chang-dso-2100/api.c | 7 +------ src/hardware/ikalogic-scanalogic2/api.c | 7 +------ src/hardware/ikalogic-scanaplus/api.c | 7 +------ src/hardware/kecheng-kc-330b/api.c | 7 +------ src/hardware/kern-scale/api.c | 7 +------ src/hardware/korad-kaxxxxp/api.c | 7 +------ src/hardware/lascar-el-usb/api.c | 7 +------ src/hardware/lecroy-logicstudio/api.c | 7 +------ src/hardware/link-mso19/api.c | 7 +------ src/hardware/manson-hcs-3xxx/api.c | 7 +------ src/hardware/maynuo-m97/api.c | 7 +------ src/hardware/mic-985xx/api.c | 11 +---------- src/hardware/motech-lps-30x/api.c | 7 +------ src/hardware/norma-dmm/api.c | 9 ++------- src/hardware/openbench-logic-sniffer/api.c | 7 +------ src/hardware/pipistrello-ols/api.c | 7 +------ src/hardware/rigol-ds/api.c | 7 +------ src/hardware/saleae-logic16/api.c | 7 +------ src/hardware/scpi-pps/api.c | 7 +------ src/hardware/serial-dmm/api.c | 7 +------ src/hardware/sysclk-lwla/api.c | 9 +-------- src/hardware/teleinfo/api.c | 7 +------ src/hardware/testo/api.c | 7 +------ src/hardware/tondaj-sl-814/api.c | 7 +------ src/hardware/uni-t-dmm/api.c | 7 +------ src/hardware/uni-t-ut32x/api.c | 7 +------ src/hardware/victor-dmm/api.c | 7 +------ src/hardware/yokogawa-dlm/api.c | 7 +------ src/hardware/zeroplus-logic-cube/api.c | 7 +------ src/libsigrok-internal.h | 1 + src/std.c | 19 +++++++++++++++++++ 56 files changed, 76 insertions(+), 336 deletions(-) diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c index 21f1f32..a61a498 100644 --- a/src/hardware/agilent-dmm/api.c +++ b/src/hardware/agilent-dmm/api.c @@ -161,11 +161,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -261,7 +256,7 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c index 62c5db8..a7d0646 100644 --- a/src/hardware/appa-55ii/api.c +++ b/src/hardware/appa-55ii/api.c @@ -121,11 +121,6 @@ scan_cleanup: return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -268,7 +263,7 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c index 09b7a9c..498ad95 100644 --- a/src/hardware/arachnid-labs-re-load-pro/api.c +++ b/src/hardware/arachnid-labs-re-load-pro/api.c @@ -164,11 +164,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -380,7 +375,7 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c index 9396f78..cbc3bca 100644 --- a/src/hardware/asix-sigma/api.c +++ b/src/hardware/asix-sigma/api.c @@ -146,11 +146,6 @@ free: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -427,7 +422,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c index 03d6e52..b592443 100644 --- a/src/hardware/atten-pps3xxx/api.c +++ b/src/hardware/atten-pps3xxx/api.c @@ -199,11 +199,6 @@ static GSList *scan_3203(struct sr_dev_driver *di, GSList *options) return scan(di, options, PPS_3203T_3S); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -509,7 +504,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan_3203, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c index c4c0737..4cca12a 100644 --- a/src/hardware/baylibre-acme/api.c +++ b/src/hardware/baylibre-acme/api.c @@ -142,11 +142,6 @@ err_out: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { (void)sdi; @@ -422,7 +417,7 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c index ae3ebe8..23c7cb2 100644 --- a/src/hardware/beaglelogic/api.c +++ b/src/hardware/beaglelogic/api.c @@ -145,11 +145,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; @@ -385,7 +380,7 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index 56f2938..cfdaacf 100644 --- a/src/hardware/brymen-bm86x/api.c +++ b/src/hardware/brymen-bm86x/api.c @@ -92,11 +92,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -291,7 +286,7 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c index d8ba7fc..91ae018 100644 --- a/src/hardware/brymen-dmm/api.c +++ b/src/hardware/brymen-dmm/api.c @@ -131,11 +131,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -236,7 +231,7 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c index 79282d5..fcfc35d 100644 --- a/src/hardware/cem-dt-885x/api.c +++ b/src/hardware/cem-dt-885x/api.c @@ -136,11 +136,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_serial_dev_inst *serial; @@ -418,7 +413,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index a51d9ac..a56de3a 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -134,11 +134,6 @@ static GSList *scan(GSList *options, int idx) return devices; } -static GSList *dev_list(int idx) -{ - return ((struct drv_context *)(center_devs[idx].di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -232,9 +227,6 @@ static int init_##X(struct sr_dev_driver *d, \ #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \ (void)d; return scan(options, X); } -#define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(const struct sr_dev_driver *d) { \ - (void)d; return dev_list(X); } #define HW_DEV_ACQUISITION_START(X) \ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } @@ -243,7 +235,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ HW_INIT(ID_UPPER) \ HW_SCAN(ID_UPPER) \ -HW_DEV_LIST(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .name = NAME, \ @@ -252,7 +243,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .init = init_##ID_UPPER, \ .cleanup = std_cleanup, \ .scan = scan_##ID_UPPER, \ - .dev_list = dev_list_##ID_UPPER, \ + .dev_list = std_dev_list, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c index e77c6de..960093e 100644 --- a/src/hardware/chronovu-la/api.c +++ b/src/hardware/chronovu-la/api.c @@ -246,11 +246,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -601,7 +596,7 @@ SR_PRIV struct sr_dev_driver chronovu_la_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c index 2f354cf..42ca4b1 100644 --- a/src/hardware/colead-slm/api.c +++ b/src/hardware/colead-slm/api.c @@ -96,11 +96,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_serial_dev_inst *serial; @@ -205,7 +200,7 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c index 8da6b8f..e03c636 100644 --- a/src/hardware/conrad-digi-35-cpu/api.c +++ b/src/hardware/conrad-digi-35-cpu/api.c @@ -106,11 +106,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -204,7 +199,7 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c index 6412877..8123c3a 100644 --- a/src/hardware/demo/demo.c +++ b/src/hardware/demo/demo.c @@ -354,11 +354,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { sdi->status = SR_ST_ACTIVE; @@ -902,7 +897,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c index 8c24eb1..2f1109b 100644 --- a/src/hardware/deree-de5000/api.c +++ b/src/hardware/deree-de5000/api.c @@ -35,11 +35,6 @@ static void std_dev_attach(struct sr_dev_driver *di, struct sr_dev_inst *sdi) drvc->instances = g_slist_append(drvc->instances, sdi); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)di->context)->instances; -} - #define LOG_PREFIX "deree-de5000" SR_PRIV struct sr_dev_driver deree_de5000_driver_info; @@ -73,7 +68,7 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = es51919_serial_config_get, .config_set = es51919_serial_config_set, diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c index 6b55bdb..c9c70c4 100644 --- a/src/hardware/fluke-dmm/api.c +++ b/src/hardware/fluke-dmm/api.c @@ -189,11 +189,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -292,7 +287,7 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c index 3a1d44a..241999f 100644 --- a/src/hardware/ftdi-la/api.c +++ b/src/hardware/ftdi-la/api.c @@ -263,11 +263,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return scan_all(di, options); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_helper(void *priv) { struct dev_context *devc; @@ -511,7 +506,7 @@ SR_PRIV struct sr_dev_driver ftdi_la_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c index e0a9952..8e4a94f 100644 --- a/src/hardware/fx2lafw/api.c +++ b/src/hardware/fx2lafw/api.c @@ -399,11 +399,6 @@ static int dev_clear(const struct sr_dev_driver *di) return std_dev_clear(di, clear_dev_context); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -906,7 +901,7 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c index 9749b7e..9e35d43 100644 --- a/src/hardware/gmc-mh-1x-2x/api.c +++ b/src/hardware/gmc-mh-1x-2x/api.c @@ -352,11 +352,6 @@ exit_err: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -537,7 +532,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan_1x_2x_rs232, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, @@ -556,7 +551,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan_2x_bd232, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/gwinstek-gds-800/api.c b/src/hardware/gwinstek-gds-800/api.c index 133ab2f..2921ea5 100644 --- a/src/hardware/gwinstek-gds-800/api.c +++ b/src/hardware/gwinstek-gds-800/api.c @@ -93,11 +93,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { int ret; @@ -257,7 +252,7 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index 879178d..33e4ae1 100644 --- a/src/hardware/hameg-hmo/api.c +++ b/src/hardware/hameg-hmo/api.c @@ -117,11 +117,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, hmo_probe_serial_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_helper(void *priv) { struct dev_context *devc; @@ -791,7 +786,7 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c index bf28508..95f080a 100644 --- a/src/hardware/hantek-6xxx/api.c +++ b/src/hardware/hantek-6xxx/api.c @@ -267,11 +267,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -828,7 +823,7 @@ SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index 0787527..5183888 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -358,11 +358,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -1017,7 +1012,7 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c index 083aad5..eb2cf5c 100644 --- a/src/hardware/hp-3457a/api.c +++ b/src/hardware/hp-3457a/api.c @@ -176,11 +176,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - /* * We need to set the HP 3457A to a known state, and there are quite a number * of knobs to tweak. Here's a brief explanation of what's going on. For more @@ -460,7 +455,7 @@ SR_PRIV struct sr_dev_driver hp_3457a_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c index 3d2aba7..3bc64ea 100644 --- a/src/hardware/hung-chang-dso-2100/api.c +++ b/src/hardware/hung-chang-dso-2100/api.c @@ -230,11 +230,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_private(void *priv) { struct dev_context *devc = priv; @@ -737,7 +732,7 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c index 8fd420d..0187bfb 100644 --- a/src/hardware/ikalogic-scanalogic2/api.c +++ b/src/hardware/ikalogic-scanalogic2/api.c @@ -162,11 +162,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_dev_context(void *priv) { struct dev_context *devc; @@ -490,7 +485,7 @@ SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c index 1388592..6de8021 100644 --- a/src/hardware/ikalogic-scanaplus/api.c +++ b/src/hardware/ikalogic-scanaplus/api.c @@ -149,11 +149,6 @@ err_free_devc: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -407,7 +402,7 @@ SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c index 9e06e34..4966ab3 100644 --- a/src/hardware/kecheng-kc-330b/api.c +++ b/src/hardware/kecheng-kc-330b/api.c @@ -160,11 +160,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -543,7 +538,7 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c index 49f19c4..f4f70da 100644 --- a/src/hardware/kern-scale/api.c +++ b/src/hardware/kern-scale/api.c @@ -119,11 +119,6 @@ scan_cleanup: return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -222,7 +217,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) .init = init, \ .cleanup = std_cleanup, \ .scan = scan, \ - .dev_list = dev_list, \ + .dev_list = std_dev_list, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index a22b838..6cad1ff 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -178,11 +178,6 @@ exit_err: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -412,7 +407,7 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c index b5ab39d..8809b19 100644 --- a/src/hardware/lascar-el-usb/api.c +++ b/src/hardware/lascar-el-usb/api.c @@ -89,11 +89,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -460,7 +455,7 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c index f5dc117..84df85b 100644 --- a/src/hardware/lecroy-logicstudio/api.c +++ b/src/hardware/lecroy-logicstudio/api.c @@ -191,11 +191,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int open_device(struct sr_dev_inst *sdi) { struct drv_context *drvc; @@ -526,7 +521,7 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c index a4d913b..1c3ee12 100644 --- a/src/hardware/link-mso19/api.c +++ b/src/hardware/link-mso19/api.c @@ -228,11 +228,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { int ret; @@ -470,7 +465,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c index 725ec31..7ae3d43 100644 --- a/src/hardware/manson-hcs-3xxx/api.c +++ b/src/hardware/manson-hcs-3xxx/api.c @@ -200,11 +200,6 @@ exit_err: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -417,7 +412,7 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c index a1ca131..a0228fa 100644 --- a/src/hardware/maynuo-m97/api.c +++ b/src/hardware/maynuo-m97/api.c @@ -199,11 +199,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_modbus_dev_inst *modbus = sdi->conn; @@ -498,7 +493,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index 1d3299a..5ad0490 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -140,11 +140,6 @@ static GSList *scan(GSList *options, int idx) return devices; } -static GSList *dev_list(int idx) -{ - return ((struct drv_context *)(mic_devs[idx].di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -240,9 +235,6 @@ static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \ #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \ (void)di; return scan(options, X); } -#define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(const struct sr_dev_driver *di) { \ - (void)di; return dev_list(X); } #define HW_CONFIG_LIST(X) \ static int config_list_##X(uint32_t key, GVariant **data, \ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \ @@ -255,7 +247,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ HW_INIT(ID_UPPER) \ HW_SCAN(ID_UPPER) \ -HW_DEV_LIST(ID_UPPER) \ HW_CONFIG_LIST(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ @@ -265,7 +256,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .init = init_##ID_UPPER, \ .cleanup = std_cleanup, \ .scan = scan_##ID_UPPER, \ - .dev_list = dev_list_##ID_UPPER, \ + .dev_list = std_dev_list, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list_##ID_UPPER, \ diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c index f56b02e..538ad58 100644 --- a/src/hardware/motech-lps-30x/api.c +++ b/src/hardware/motech-lps-30x/api.c @@ -517,11 +517,6 @@ static GSList *scan_lps301(struct sr_dev_driver *di, GSList *options) return do_scan(LPS_301, di, options); } -static GSList *dev_list_lps301(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void dev_clear_private(struct dev_context *devc) { int ch_idx; @@ -837,7 +832,7 @@ SR_PRIV struct sr_dev_driver motech_lps_301_driver_info = { .init = init_lps301, .cleanup = std_cleanup, .scan = scan_lps301, - .dev_list = dev_list_lps301, + .dev_list = std_dev_list, .dev_clear = dev_clear_lps301, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c index 5162f40..183da7f 100644 --- a/src/hardware/norma-dmm/api.c +++ b/src/hardware/norma-dmm/api.c @@ -172,11 +172,6 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_close(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -291,7 +286,7 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, @@ -310,7 +305,7 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c index 78b4ef4..4b49b27 100644 --- a/src/hardware/openbench-logic-sniffer/api.c +++ b/src/hardware/openbench-logic-sniffer/api.c @@ -210,11 +210,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -593,7 +588,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c index 83331c9..46e238b 100644 --- a/src/hardware/pipistrello-ols/api.c +++ b/src/hardware/pipistrello-ols/api.c @@ -200,11 +200,6 @@ err_free_ftdi_buf: return NULL; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_helper(void *priv) { struct dev_context *devc; @@ -725,7 +720,7 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c index 7871af5..9d679ad 100644 --- a/src/hardware/rigol-ds/api.c +++ b/src/hardware/rigol-ds/api.c @@ -411,11 +411,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { int ret; @@ -1075,7 +1070,7 @@ SR_PRIV struct sr_dev_driver rigol_ds_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/saleae-logic16/api.c b/src/hardware/saleae-logic16/api.c index 70b2eac..63f38b7 100644 --- a/src/hardware/saleae-logic16/api.c +++ b/src/hardware/saleae-logic16/api.c @@ -235,11 +235,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int logic16_dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di; @@ -808,7 +803,7 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c index 40771f1..7ed85c2 100644 --- a/src/hardware/scpi-pps/api.c +++ b/src/hardware/scpi-pps/api.c @@ -176,11 +176,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -645,7 +640,7 @@ SR_PRIV struct sr_dev_driver scpi_pps_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 8222d5c..f43f6bf 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -145,11 +145,6 @@ scan_cleanup: return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -251,7 +246,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) .init = init, \ .cleanup = std_cleanup, \ .scan = scan, \ - .dev_list = dev_list, \ + .dev_list = std_dev_list, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c index 1467698..15efbed 100644 --- a/src/hardware/sysclk-lwla/api.c +++ b/src/hardware/sysclk-lwla/api.c @@ -212,13 +212,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -/* Return the list of devices found during scan. - */ -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - /* Destroy the private device context. */ static void clear_dev_context(void *priv) @@ -809,7 +802,7 @@ SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c index 687b9bb..37d0f6a 100644 --- a/src/hardware/teleinfo/api.c +++ b/src/hardware/teleinfo/api.c @@ -133,11 +133,6 @@ scan_cleanup: return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -235,7 +230,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c index 2ca80bf..ee36e76 100644 --- a/src/hardware/testo/api.c +++ b/src/hardware/testo/api.c @@ -146,11 +146,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -508,7 +503,7 @@ SR_PRIV struct sr_dev_driver testo_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .config_get = config_get, .config_set = config_set, .config_list = config_list, diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c index 490f8ca..e7348a2 100644 --- a/src/hardware/tondaj-sl-814/api.c +++ b/src/hardware/tondaj-sl-814/api.c @@ -106,11 +106,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -192,7 +187,7 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = NULL, .config_set = config_set, diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c index 4915ff3..39521dc 100644 --- a/src/hardware/uni-t-dmm/api.c +++ b/src/hardware/uni-t-dmm/api.c @@ -103,11 +103,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di; @@ -226,7 +221,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) .init = init, \ .cleanup = std_cleanup, \ .scan = scan, \ - .dev_list = dev_list, \ + .dev_list = std_dev_list, \ .config_get = NULL, \ .config_set = config_set, \ .config_list = config_list, \ diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c index 4a9d76a..ee75841 100644 --- a/src/hardware/uni-t-ut32x/api.c +++ b/src/hardware/uni-t-ut32x/api.c @@ -98,11 +98,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -342,7 +337,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c index c4e8af0..5546a3c 100644 --- a/src/hardware/victor-dmm/api.c +++ b/src/hardware/victor-dmm/api.c @@ -101,11 +101,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -422,7 +417,7 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 52b6668..a4620d9 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -128,11 +128,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_usbtmc_device); } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static void clear_helper(void *priv) { struct dev_context *devc; @@ -698,7 +693,7 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set, diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c index 6542356..bbc539e 100644 --- a/src/hardware/zeroplus-logic-cube/api.c +++ b/src/hardware/zeroplus-logic-cube/api.c @@ -256,11 +256,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return devices; } -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_open(struct sr_dev_inst *sdi) { struct sr_dev_driver *di = sdi->driver; @@ -722,7 +717,7 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = { .init = init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = NULL, .config_get = config_get, .config_set = config_set, diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h index 3d2ca8c..f69373d 100644 --- a/src/libsigrok-internal.h +++ b/src/libsigrok-internal.h @@ -860,6 +860,7 @@ SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi, const char *prefix); SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, std_dev_clear_callback clear_private); +SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di); SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi); /*--- resource.c ------------------------------------------------------------*/ diff --git a/src/std.c b/src/std.c index a2a62b7..4cb5542 100644 --- a/src/std.c +++ b/src/std.c @@ -313,3 +313,22 @@ SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver, return ret; } + +/** + * Standard implementation for the driver dev_list() callback + * + * This function can be used as the dev_list callback by most drivers that use + * the standard helper functions. It returns the devices contained in the driver + * context instances list. + * + * @param di The driver instance to use. + * + * @return The list of devices/instances of this driver, or NULL upon errors + * or if the list is empty. + */ +SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di) +{ + struct drv_context *drvc = di->context; + + return drvc->instances; +} -- 2.1.4 ------------------------------------------------------------------------------ Find and fix application performance issues faster with Applications Manager Applications Manager provides deep performance insights into multiple tiers of your business applications. It resolves application problems quickly and reduces your MTTR. Get your free trial! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z _______________________________________________ sigrok-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/sigrok-devel
