X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=22a0c9b8b37d0035c88f244a3e6dbbebcb72e228;hp=1d83228c8b1baa9654a9210198c71ec53478f443;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 1d83228c..22a0c9b8 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -22,6 +22,10 @@
 #include <time.h>
 #include <sys/timerfd.h>
 
+static const uint32_t drvopts[] = {
+	SR_CONF_THERMOMETER,
+};
+
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -53,18 +57,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 +71,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 +121,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);
@@ -135,24 +130,6 @@ err_out:
 	return NULL;
 }
 
-static int dev_open(struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	sdi->status = SR_ST_ACTIVE;
-
-	return SR_OK;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	sdi->status = SR_ST_INACTIVE;
-
-	return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
 		      const struct sr_dev_inst *sdi,
 		      const struct sr_channel_group *cg)
@@ -202,9 +179,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;
@@ -247,18 +221,12 @@ static int config_list(uint32_t key, GVariant **data,
 	uint32_t devopts_cg[MAX_DEVOPTS_CG];
 	GVariant *gvar;
 	GVariantBuilder gvb;
-	int ret, num_devopts_cg = 0;
-
-	(void)sdi;
-	(void)cg;
+	int num_devopts_cg = 0;
 
-	ret = SR_OK;
 	if (!cg) {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
+			return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
 		case SR_CONF_SAMPLERATE:
 			g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
 			gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
@@ -286,7 +254,7 @@ static int config_list(uint32_t key, GVariant **data,
 		}
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static void dev_acquisition_close(const struct sr_dev_inst *sdi)
@@ -325,9 +293,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 +322,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 +334,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);
@@ -394,11 +356,12 @@ static struct sr_dev_driver baylibre_acme_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,
-	.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,