X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fapi.c;h=2b11fdc7d12eb501a4f491f6f85faa76d048b11b;hb=53279f13e4694fcf2aba314baade418941b0bc3e;hp=a94a917ad811b8fc0bf153a345adfed4145ddf17;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index a94a917a..2b11fdc7 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -73,14 +73,12 @@ static struct dev_context *beaglelogic_devc_alloc(void)
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	GSList *devices, *l;
+	GSList *l;
 	struct sr_config *src;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	int i, maxch;
 
-	devices = NULL;
-
 	/* Probe for /dev/beaglelogic */
 	if (!g_file_test(BEAGLELOGIC_DEV_NODE, G_FILE_TEST_EXISTS))
 		return NULL;
@@ -128,9 +126,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 				channel_names[i]);
 
 	sdi->priv = devc;
-	devices = g_slist_append(devices, sdi);
 
-	return std_scan_complete(di, devices);
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -160,8 +157,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	/* We're good to go now */
-	sdi->status = SR_ST_ACTIVE;
 	return SR_OK;
 }
 
@@ -169,12 +164,10 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
 
-	if (sdi->status == SR_ST_ACTIVE) {
-		/* Close the memory mapping and the file */
-		beaglelogic_munmap(devc);
-		beaglelogic_close(devc);
-	}
-	sdi->status = SR_ST_INACTIVE;
+	/* Close the memory mapping and the file */
+	beaglelogic_munmap(devc);
+	beaglelogic_close(devc);
+
 	return SR_OK;
 }
 
@@ -213,9 +206,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
 		devc->cur_samplerate = g_variant_get_uint64(data);
@@ -297,9 +287,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc = sdi->priv;
 	struct sr_trigger *trigger;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	/* Clear capture state */
 	devc->bytes_read = 0;
 	devc->offset = 0;
@@ -320,7 +307,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		devc->trigger_fired = FALSE;
 	} else
 		devc->trigger_fired = TRUE;
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Trigger and add poll on file */
 	beaglelogic_start(devc);
@@ -335,9 +322,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc = sdi->priv;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	/* Execute a stop on BeagleLogic */
 	beaglelogic_stop(devc);
 
@@ -346,7 +330,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	/* Remove session source and send EOT packet */
 	sr_session_source_remove_pollfd(sdi->session, &devc->pollfd);
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	return SR_OK;
 }
@@ -359,6 +343,7 @@ static struct sr_dev_driver beaglelogic_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,