Don't reset instance list in scan() callback

[libsigrok.git] / src / hardware / manson-hcs-3xxx / api.c

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 29a29f9f48e0ee8bea6df937a1835e4d94d2a370..0b0a053e7bd2630854eab1abf8365ebdfd9a6d22 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -73,13 +73,6 @@ static const struct hcs_model models[] = {
        ALL_ZERO
 };
 
-SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        int i, model_id;
@@ -93,7 +86,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        char reply[50], **tokens, *dummy;
 
        drvc = di->context;
-       drvc->instances = NULL;
        devices = NULL;
        conn = NULL;
        serialcomm = NULL;
@@ -392,11 +384,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 manson_hcs_3xxx_driver_info = {
+static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .name = "manson-hcs-3xxx",
        .longname = "Manson HCS-3xxx",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -409,3 +401,4 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(manson_hcs_3xxx_driver_info);