X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=bd80b6e1b5e22e0db693f6222b9105586de625bc;hb=566007e15e8ec0a23b064ba8ea44baae305508b5;hp=6f4ad65a04491ac4f35836f2f4915d9fb8f0447f;hpb=c45c32ce47f429099cb0f1cabc1b45b9bcf44855;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index 6f4ad65a..bd80b6e1 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -62,13 +62,6 @@ static const struct korad_kaxxxxp_model models[] = { ALL_ZERO }; -SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info; - -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(di, sr_ctx); -} - static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; @@ -86,7 +79,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) conn = NULL; serialcomm = NULL; drvc = di->context; - drvc->instances = NULL; for (l = options; l; l = l->next) { src = l->data; @@ -293,7 +285,6 @@ static int config_set(uint32_t key, GVariant *data, static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - struct dev_context *devc; GVariant *gvar; GVariantBuilder gvb; @@ -386,11 +377,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) std_serial_dev_close, sdi->conn, LOG_PREFIX); } -SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = { +static struct sr_dev_driver korad_kaxxxxp_driver_info = { .name = "korad-kaxxxxp", .longname = "Korad KAxxxxP", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, @@ -403,3 +394,4 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(korad_kaxxxxp_driver_info);