X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=source%2Fdrv-api.c;h=20ac9c733b52309eeeb069dc373dbbf451b178e6;hb=e4b264d175feee028f16ab6db47d9a431987956b;hp=f0d09d4a9e2ade5421191cb9989558fcc6c99a41;hpb=12a98d0aee7251ab9ef26a5c3a1ae82f5daaf287;p=sigrok-util.git

diff --git a/source/drv-api.c b/source/drv-api.c
index f0d09d4..20ac9c7 100644
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -20,14 +20,13 @@
 #include "protocol.h"
 
 SR_PRIV struct sr_dev_driver ${lib}_driver_info;
-static struct sr_dev_driver *di = &${lib}_driver_info;
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct drv_context *drvc;
 	GSList *devices;
@@ -35,7 +34,7 @@ static GSList *scan(GSList *options)
 	(void)options;
 
 	devices = NULL;
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 
 	/* TODO: scan for devices, either based on a SR_CONF_CONN option
@@ -44,12 +43,12 @@ static GSList *scan(GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }
@@ -76,9 +75,9 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-	dev_clear();
+	dev_clear(di);
 
 	/* TODO: free other driver resources, if any. */
 
@@ -187,5 +186,5 @@ SR_PRIV struct sr_dev_driver ${lib}_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };