X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=8e1bba8d780913d43db06716628f263563054cf0;hb=c01bf34ca264b268fee2e71ab918c71d28dc3018;hp=2bf20627a02d1381cb7bc3c3a9e045d489bad6d0;hpb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;p=libsigrok.git diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index 2bf20627..8e1bba8d 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) { @@ -237,9 +232,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) { \ @@ -252,7 +244,6 @@ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi \ #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 = { \ @@ -262,7 +253,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, \