X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmic-985xx%2Fapi.c;fp=src%2Fhardware%2Fmic-985xx%2Fapi.c;h=0e957febe3427019ada3d056f965fbc08316cad6;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hp=70914e1cd2c94379d3befe7762c72293701242a0;hpb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;p=libsigrok.git diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c index 70914e1c..0e957feb 100644 --- a/src/hardware/mic-985xx/api.c +++ b/src/hardware/mic-985xx/api.c @@ -57,11 +57,6 @@ SR_PRIV const struct mic_dev_info mic_devs[] = { }, }; -static int init(struct sr_context *sr_ctx, int idx) -{ - return std_init(mic_devs[idx].di, sr_ctx); -} - static GSList *mic_scan(const char *conn, const char *serialcomm, int idx) { struct sr_dev_inst *sdi; @@ -215,9 +210,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) } /* Driver-specific API function wrappers */ -#define HW_INIT(X) \ -static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \ - (void)di; return init(sr_ctx, X); } #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \ (void)di; return scan(options, X); } @@ -231,7 +223,6 @@ static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi \ /* Driver structs and API function wrappers */ #define DRV(ID, ID_UPPER, NAME, LONGNAME) \ -HW_INIT(ID_UPPER) \ HW_SCAN(ID_UPPER) \ HW_CONFIG_LIST(ID_UPPER) \ HW_DEV_ACQUISITION_START(ID_UPPER) \ @@ -239,7 +230,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .name = NAME, \ .longname = LONGNAME, \ .api_version = 1, \ - .init = init_##ID_UPPER, \ + .init = std_init, \ .cleanup = std_cleanup, \ .scan = scan_##ID_UPPER, \ .dev_list = std_dev_list, \