sr_dev_open(): Set status to SR_ST_ACTIVE upon success.

[libsigrok.git] / src / hardware / baylibre-acme / api.c

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 1d83228c8b1baa9654a9210198c71ec53478f443..fff5e8da0dbd3ceaf97b282bab83959ab1142aab 100644 (file)
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -53,18 +53,13 @@ static const uint64_t samplerates[] = {
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
-       GSList *devices;
        gboolean status;
        int i;
 
        (void)options;
 
-       drvc = di->context;
-       devices = NULL;
-
        devc = g_malloc0(sizeof(struct dev_context));
        devc->samplerate = SR_HZ(10);
 
@@ -72,7 +67,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("BayLibre");
        sdi->model = g_strdup("ACME");
-       sdi->driver = di;
        sdi->priv = devc;
 
        status = bl_acme_is_sane();
@@ -123,10 +117,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (!sdi->channel_groups)
                goto err_out;
 
-       devices = g_slist_append(devices, sdi);
-       drvc->instances = g_slist_append(drvc->instances, sdi);
-
-       return devices;
+       return std_scan_complete(di, g_slist_append(NULL, sdi));
 
 err_out:
        g_free(devc);
@@ -139,8 +130,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 {
        (void)sdi;
 
-       sdi->status = SR_ST_ACTIVE;
-
        return SR_OK;
 }
 
@@ -202,9 +191,6 @@ static int config_set(uint32_t key, GVariant *data,
        uint64_t samplerate;
        int ret;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
        ret = SR_OK;
@@ -325,9 +311,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                .it_value = { 0, 0 }
        };
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        if (dev_acquisition_open(sdi))
                return SR_ERR;
 
@@ -357,7 +340,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_session_source_add_channel(sdi->session, devc->channel,
                G_IO_IN | G_IO_ERR, 1000, bl_acme_receive_data, (void *)sdi);
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       std_session_send_df_header(sdi);
        sr_sw_limits_acquisition_start(&devc->limits);
 
        return SR_OK;
@@ -369,16 +352,13 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        dev_acquisition_close(sdi);
        sr_session_source_remove_channel(sdi->session, devc->channel);
        g_io_channel_shutdown(devc->channel, FALSE, NULL);
        g_io_channel_unref(devc->channel);
        devc->channel = NULL;
 
-       std_session_send_df_end(sdi, LOG_PREFIX);
+       std_session_send_df_end(sdi);
 
        if (devc->samples_missed > 0)
                sr_warn("%" PRIu64 " samples missed", devc->samples_missed);