X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fapi.c;h=a1b860e3621fb91a1655d97fda085a66fb339e08;hb=d1144645512490c64813f4ef5a5b0c305de50260;hp=a556449c67654824a0e89d8935589db53799d91f;hpb=d54a7c42ac6540d90e99e5138c945d789e3dac6f;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index a556449c..a1b860e3 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -22,8 +22,6 @@
 #include <time.h>
 #include <sys/timerfd.h>
 
-SR_PRIV struct sr_dev_driver baylibre_acme_driver_info;
-
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -53,25 +51,15 @@ static const uint64_t samplerates[] = {
 	SR_HZ(1),
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 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);
 
@@ -79,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();
@@ -130,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);
@@ -364,7 +348,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;
@@ -385,7 +369,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	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);
@@ -393,11 +377,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
+static struct sr_dev_driver baylibre_acme_driver_info = {
 	.name = "baylibre-acme",
 	.longname = "BayLibre ACME (Another Cute Measurement Equipment)",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
@@ -410,3 +394,4 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(baylibre_acme_driver_info);