new-driver: Update for probe groups changes.

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

diff --git a/source/drv-api.c b/source/drv-api.c
index 8670bed070d8ee30137c0fe490f0f0960c403d8c..8bfe5fddbc519c0b31ef0a588954ca1d94b37a87 100644 (file)
--- a/source/drv-api.c
+++ b/source/drv-api.c
@@ -22,10 +22,9 @@
 SR_PRIV struct sr_dev_driver ${lib}_driver_info;
 static struct sr_dev_driver *di = &${lib}_driver_info;
 
-
 static int init(struct sr_context *sr_ctx)
 {
-       return std_hw_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options)
@@ -47,11 +46,7 @@ static GSList *scan(GSList *options)
 
 static GSList *dev_list(void)
 {
-       struct drv_context *drvc;
-
-       drvc = di->priv;
-
-       return drvc->instances;
+       return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int dev_clear(void)
@@ -90,12 +85,14 @@ static int cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        int ret;
 
        (void)sdi;
        (void)data;
+       (void)probe_group;
 
        ret = SR_OK;
        switch (key) {
@@ -107,11 +104,13 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        int ret;
 
        (void)data;
+       (void)probe_group;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -126,12 +125,14 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
        return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        int ret;
 
        (void)sdi;
        (void)data;
+       (void)probe_group;
 
        ret = SR_OK;
        switch (key) {