X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=40e8dbd66efc40f0402360edbf529bb662bc01a0;hp=c78825ab0b2727f71bdd6fa8a7a5f9ef01acfd58;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hpb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855 diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index c78825ab..40e8dbd6 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -56,11 +56,6 @@ SR_PRIV const struct center_dev_info center_devs[] = { }, }; -static int init(struct sr_context *sr_ctx, int idx) -{ - return std_init(center_devs[idx].di, sr_ctx); -} - static GSList *center_scan(const char *conn, const char *serialcomm, int idx) { int i; @@ -203,9 +198,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 *d, \ - struct sr_context *sr_ctx) { (void)d; return init(sr_ctx, X); } #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \ (void)d; return scan(options, X); } @@ -215,14 +207,13 @@ 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_DEV_ACQUISITION_START(ID_UPPER) \ 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, \