remove datastore functionality

[libsigrok.git] / hardware / chronovu-la8 / api.c

diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c
index 75f085c6bf646115fa30c7dab27c1c83284ccc66..c7a5ba83c8084bdba1acb82ba467b1b9dd4a0031 100644 (file)
--- a/hardware/chronovu-la8/api.c
+++ b/hardware/chronovu-la8/api.c
@@ -68,7 +68,7 @@ static int clear_instances(void)
        return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
        struct drv_context *drvc;
 
@@ -77,6 +77,7 @@ static int hw_init(void)
                return SR_ERR_MALLOC;
        }
 
+       drvc->sr_ctx = sr_ctx;
        di->priv = drvc;
 
        return SR_OK;
@@ -159,7 +160,7 @@ static GSList *hw_scan(GSList *options)
        sdi->priv = devc;
 
        for (i = 0; probe_names[i]; i++) {
-               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+               if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE,
                                           probe_names[i])))
                        return NULL;
                sdi->probes = g_slist_append(sdi->probes, probe);
@@ -178,7 +179,7 @@ static GSList *hw_scan(GSList *options)
 err_close_ftdic:
        (void) la8_close(devc); /* Log, but ignore errors. */
 err_free_ftdic:
-       free(devc->ftdic); /* NOT g_free()! */
+       ftdi_free(devc->ftdic); /* NOT free() or g_free()! */
 err_free_final_buf:
        g_free(devc->final_buf);
 err_free_devc:
@@ -278,10 +279,9 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 
 static int hw_cleanup(void)
 {
-       if (!di->priv) {
-               sr_err("%s: di->priv was NULL.", __func__);
-               return SR_ERR_BUG;
-       }
+       if (!di->priv)
+               /* Can get called on an unused driver, doesn't matter. */
+               return SR_OK;
 
        clear_instances();