Don't reset instance list in scan() callback

[libsigrok.git] / src / hardware / korad-kaxxxxp / api.c

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 9a2b916946cbd3794a222f323d2caeb64205a54f..bd80b6e1b5e22e0db693f6222b9105586de625bc 100644 (file)
--- 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, LOG_PREFIX);
-}
-
 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);