X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=source%2Fdrv-api.c;h=daaded9154890161537951b8e301bf2b78942ff8;hb=c495c6dd988f138cbd0563971532052a08e2b1da;hp=26707b336380b3b4b3cb33947e0d39be78662db9;hpb=d73e0933046c580cc6d52f7099364a2af6ce141f;p=sigrok-util.git
diff --git a/source/drv-api.c b/source/drv-api.c
index 26707b3..daaded9 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,35 @@
* along with this program. If not, see .
*/
+#include
#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)
-{
- 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)
-{
+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 +53,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 +64,11 @@ static int dev_close(struct sr_dev_inst *sdi)
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,
- 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 +76,18 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
(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,
- 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 +97,18 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
return SR_ERR_DEV_CLOSED;
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,
- 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,21 +116,17 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
(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;
+}}
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
+{{
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -157,28 +134,26 @@ 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;
+}}
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
+{{
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
/* 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,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
@@ -187,5 +162,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);