clear_helper(): Use a cast to shorten all implementations.

[libsigrok.git] / src / hardware / demo / api.c

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index f1a97eb4e5519f8a47f97c0e12290cf239c23b5a..f88b4c2ea794de37992a0e0fafb4a4a4bfee367f 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -180,39 +180,21 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
+static void clear_helper(struct dev_context *devc)
 {
-       sdi->status = SR_ST_ACTIVE;
-
-       return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
-}
-
-static void clear_helper(void *priv)
-{
-       struct dev_context *devc;
        GHashTableIter iter;
        void *value;
 
-       devc = priv;
-
        /* Analog generators. */
        g_hash_table_iter_init(&iter, devc->ch_ag);
        while (g_hash_table_iter_next(&iter, NULL, &value))
                g_free(value);
        g_hash_table_unref(devc->ch_ag);
-       g_free(devc);
 }
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -288,9 +270,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        devc = sdi->priv;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        ret = SR_OK;
        switch (key) {
        case SR_CONF_SAMPLERATE:
@@ -464,9 +443,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        GHashTableIter iter;
        void *value;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
        devc->sent_samples = 0;
 
@@ -503,8 +479,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        bitpos = devc->enabled_logic_channels % 8;
        mask = (1 << bitpos) - 1;
        devc->first_partial_logic_mask = mask;
-       sr_dbg("DBG: %s(), num logic %zu, partial off %zu, mask 0x%02x",
-               __func__, devc->enabled_logic_channels,
+       sr_dbg("num logic %zu, partial off %zu, mask 0x%02x.",
+               devc->enabled_logic_channels,
                devc->first_partial_logic_index,
                devc->first_partial_logic_mask);
 
@@ -532,7 +508,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       sr_dbg("Stopping acquisition.");
        sr_session_source_remove(sdi->session, -1);
        std_session_send_df_end(sdi);
 
@@ -551,8 +526,8 @@ static struct sr_dev_driver demo_driver_info = {
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,
-       .dev_open = dev_open,
-       .dev_close = dev_close,
+       .dev_open = std_dummy_dev_open,
+       .dev_close = std_dummy_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,