X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fapi.c;h=0e63122a74900fb89e7f2bef9824f02d37c7507e;hb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;hp=d4451cbe72b539c8755e078f81271b2d5384133f;hpb=1e726f568d6d72a8c6afdcd8fa98b98e910ad523;p=libsigrok.git diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c index d4451cbe..0e63122a 100644 --- a/src/hardware/center-3xx/api.c +++ b/src/hardware/center-3xx/api.c @@ -144,11 +144,6 @@ static GSList *dev_list(int idx) return ((struct drv_context *)(center_devs[idx].di->context))->instances; } -static int cleanup(int idx) -{ - return dev_clear(idx); -} - static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { @@ -236,9 +231,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) #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_CLEANUP(X) \ -static int cleanup_##X(const struct sr_dev_driver *d) { \ - (void)d; return cleanup(X); } #define HW_SCAN(X) \ static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \ (void)d; return scan(options, X); } @@ -255,7 +247,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_CLEANUP(ID_UPPER) \ HW_SCAN(ID_UPPER) \ HW_DEV_LIST(ID_UPPER) \ HW_DEV_CLEAR(ID_UPPER) \ @@ -265,7 +256,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \ .longname = LONGNAME, \ .api_version = 1, \ .init = init_##ID_UPPER, \ - .cleanup = cleanup_##ID_UPPER, \ + .cleanup = std_cleanup, \ .scan = scan_##ID_UPPER, \ .dev_list = dev_list_##ID_UPPER, \ .dev_clear = dev_clear_##ID_UPPER, \