X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=source%2Fdrv-api.c;h=6a1c20c70b8328a7fa2fcb7e6a1cdc237dc78562;hp=ae594f17947ba6e2a21fdf4976360214dbf44a9e;hb=8cb6848a1f106540003ba76a5704769cf3dd0897;hpb=28fca3a8f9e73c86d27f20065e51c69a9118a60e

diff --git a/source/drv-api.c b/source/drv-api.c
index ae594f1..6a1c20c 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,163 +17,131 @@
  * 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;
+static struct sr_dev_driver {lib}_driver_info;
 
-static int init(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 int dev_clear(void)
-{
-	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. */
 
-	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. */
 
-	sdi->status = SR_ST_INACTIVE;
-
 	return SR_OK;
-}
+}}
 
-static int cleanup(void)
-{
-	dev_clear();
-
-	/* TODO: free other driver resources, if any. */
-
-	return SR_OK;
-}
-
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
-{
+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;
 	(void)data;
+	(void)cg;
 
 	ret = SR_OK;
-	switch (key) {
+	switch (key) {{
 	/* TODO */
 	default:
 		return SR_ERR_NA;
-	}
+	}}
 
 	return ret;
-}
+}}
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
-{
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+{{
 	int ret;
 
+	(void)sdi;
 	(void)data;
-
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
+	(void)cg;
 
 	ret = SR_OK;
-	switch (key) {
+	switch (key) {{
 	/* TODO */
 	default:
 		ret = SR_ERR_NA;
-	}
+	}}
 
 	return ret;
-}
+}}
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
-{
+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;
 	(void)data;
+	(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)
-{
-	(void)sdi;
-	(void)cb_data;
-
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
+}}
 
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
+{{
 	/* TODO: configure hardware, reset acquisition state, set up
 	 * callbacks and send header packet. */
 
-	return SR_OK;
-}
-
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
-{
-	(void)cb_data;
+	(void)sdi;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
+	return SR_OK;
+}}
 
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
+{{
 	/* TODO: stop acquisition. */
 
+	(void)sdi;
+
 	return SR_OK;
-}
+}}
 
-SR_PRIV struct sr_dev_driver ${lib}_driver_info = {
-	.name = "${short}",
-	.longname = "${name}",
+static struct sr_dev_driver {lib}_driver_info = {{
+	.name = "{short}",
+	.longname = "{name}",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
@@ -181,5 +149,6 @@ 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);