X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fapi.c;h=cafba7da33e0a6b6c833ccc0e2e074486734ea61;hb=093e1cba6b7bf14cfb77fa36f59b0c16e6fca7cc;hp=3f270fb081f3819cab784c9b0eadca028be640dd;hpb=ab939ebba60a18786b91509298bd82f28c4b8fb3;p=libsigrok.git

diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 3f270fb0..cafba7da 100644
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -33,13 +33,6 @@ static const uint32_t devopts[] = {
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info;
-
-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)
 {
 	GSList *usb_devices, *devices, *l;
@@ -51,7 +44,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn;
 
 	drvc = di->context;
-	drvc->instances = NULL;
 
 	conn = BRYMEN_BC86X;
 	for (l = options; l; l = l->next) {
@@ -78,7 +70,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->model = g_strdup("BM869");
 		devc = g_malloc0(sizeof(struct dev_context));
 		sdi->priv = devc;
-		sdi->driver = di;
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P2");
 
@@ -87,11 +78,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		sr_sw_limits_init(&devc->sw_limits);
 
-		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -141,9 +131,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	usb = sdi->conn;
 	devc = sdi->priv;
 
@@ -186,13 +173,7 @@ 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;
-
-	if (!(devc = sdi->priv)) {
-		sr_err("sdi->priv was NULL.");
-		return SR_ERR_BUG;
-	}
+	devc = sdi->priv;
 
 	return sr_sw_limits_config_set(&devc->sw_limits, key, data);
 }
@@ -223,14 +204,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	sr_sw_limits_acquisition_start(&devc->sw_limits);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	sr_session_source_add(sdi->session, -1, 0, 10,
 			brymen_bm86x_receive_data, (void *)sdi);
@@ -240,21 +218,18 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 
 	sr_session_source_remove(sdi->session, -1);
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = {
+static struct sr_dev_driver brymen_bm86x_driver_info = {
 	.name = "brymen-bm86x",
 	.longname = "Brymen BM86X",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
@@ -268,3 +243,4 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(brymen_bm86x_driver_info);