new-driver: Adapt to recent driver API changes.

Use the new std_init(), std_cleanup(), and std_dev_list() in the
generated files.

Drop 'cb_data' argument from dev_acquisition_{start,stop}.

diff --git a/source/drv-api.c b/source/drv-api.c
index 6566d629a8b7cec0e97741135a0127f0fc80db82..daaded9154890161537951b8e301bf2b78942ff8 100644 (file)
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -22,11 +22,6 @@
 
 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);
-}}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {{
        struct drv_context *drvc;
@@ -44,11 +39,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        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);
@@ -76,15 +66,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        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)
 {{
@@ -144,11 +125,8 @@ static int config_list(uint32_t key, GVariant **data,
        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)sdi;
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -158,10 +136,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }}
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {{
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -174,10 +150,10 @@ 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,