X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fapi.c;h=6549b5d784c5db8fe069dbd5a3223cca57e99d25;hb=8bf18daabbf3cb0fec6c178b4bc7f6283a314e45;hp=5ab1f4afdfe9dc213e0d6b1de1d68d7ce30cc1ee;hpb=d2f7c417fdd96a13d8fd86350d2fc13db16f626c;p=libsigrok.git

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 5ab1f4af..6549b5d7 100644
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -180,20 +180,6 @@ 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)
-{
-	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;
@@ -207,12 +193,11 @@ static void clear_helper(void *priv)
 	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, clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -288,9 +273,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 +446,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 +482,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);
 
@@ -550,8 +529,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,