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

diff --git a/source/drv-api.c b/source/drv-api.c
index f0d09d4..6566d62 100644
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) ${year} ${author} <${email}>
+ * Copyright (C) {year} {author} <{email}>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,45 +17,45 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
-SR_PRIV struct sr_dev_driver ${lib}_driver_info;
-static struct sr_dev_driver *di = &${lib}_driver_info;
+SR_PRIV struct sr_dev_driver {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;
 
 	(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
 	 * or on a USB scan. */
 
 	return devices;
-}
+}}
 
-static GSList *dev_list(void)
-{
-	return ((struct drv_context *)(di->priv))->instances;
-}
+static GSList *dev_list(const struct sr_dev_driver *di)
+{{
+	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);
-}
+}}
 
 static int dev_open(struct sr_dev_inst *sdi)
-{
+{{
 	(void)sdi;
 
 	/* TODO: get handle from sdi->conn and open it. */
@@ -63,10 +63,10 @@ static int dev_open(struct sr_dev_inst *sdi)
 	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
-}
+}}
 
 static int dev_close(struct sr_dev_inst *sdi)
-{
+{{
 	(void)sdi;
 
 	/* TODO: get handle from sdi->conn and close it. */
@@ -74,20 +74,20 @@ static int dev_close(struct sr_dev_inst *sdi)
 	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
-}
+}}
 
-static int cleanup(void)
-{
-	dev_clear();
+static int cleanup(const struct sr_dev_driver *di)
+{{
+	dev_clear(di);
 
 	/* TODO: free other driver resources, if any. */
 
 	return SR_OK;
-}
+}}
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
-{
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+{{
 	int ret;
 
 	(void)sdi;
@@ -95,18 +95,18 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	(void)cg;
 
 	ret = SR_OK;
-	switch (key) {
+	switch (key) {{
 	/* TODO */
 	default:
 		return SR_ERR_NA;
-	}
+	}}
 
 	return ret;
-}
+}}
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
-{
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+{{
 	int ret;
 
 	(void)data;
@@ -116,18 +116,18 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		return SR_ERR_DEV_CLOSED;
 
 	ret = SR_OK;
-	switch (key) {
+	switch (key) {{
 	/* TODO */
 	default:
 		ret = SR_ERR_NA;
-	}
+	}}
 
 	return ret;
-}
+}}
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
-{
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+{{
 	int ret;
 
 	(void)sdi;
@@ -135,18 +135,17 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	(void)cg;
 
 	ret = SR_OK;
-	switch (key) {
+	switch (key) {{
 	/* TODO */
 	default:
 		return SR_ERR_NA;
-	}
+	}}
 
 	return ret;
-}
+}}
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-		void *cb_data)
-{
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+{{
 	(void)sdi;
 	(void)cb_data;
 
@@ -157,10 +156,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	 * callbacks and send header packet. */
 
 	return SR_OK;
-}
+}}
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
-{
+{{
 	(void)cb_data;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -169,11 +168,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	/* TODO: stop acquisition. */
 
 	return SR_OK;
-}
+}}
 
-SR_PRIV struct sr_dev_driver ${lib}_driver_info = {
-	.name = "${short}",
-	.longname = "${name}",
+SR_PRIV struct sr_dev_driver {lib}_driver_info = {{
+	.name = "{short}",
+	.longname = "{name}",
 	.api_version = 1,
 	.init = init,
 	.cleanup = cleanup,
@@ -187,5 +186,7 @@ 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,
+}};
+
+SR_REGISTER_DEV_DRIVER({lib}_driver_info);