new-driver: Adapt to recent driver API changes.

[sigrok-util.git] / source / drv-api.c

diff --git a/source/drv-api.c b/source/drv-api.c
index 824027f962c9c265746ea73e96e736fa4c6c9fea..daaded9154890161537951b8e301bf2b78942ff8 100644 (file)
--- 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
@@ -20,15 +20,10 @@
 #include <config.h>
 #include "protocol.h"
 
-SR_PRIV struct sr_dev_driver ${lib}_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
+SR_PRIV struct sr_dev_driver {lib}_driver_info;
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
-{
+{{
        struct drv_context *drvc;
        GSList *devices;
 
@@ -42,20 +37,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
         * or on a USB scan. */
 
        return devices;
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
+}}
 
 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(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 +76,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 +97,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,21 +116,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)
-{
-       (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,
@@ -188,4 +163,6 @@ SR_PRIV struct sr_dev_driver ${lib}_driver_info = {
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
-};
+}};
+
+SR_REGISTER_DEV_DRIVER({lib}_driver_info);