X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=source%2Fdrv-api.c;h=8bfe5fddbc519c0b31ef0a588954ca1d94b37a87;hp=0ef289d96be76a0841a8cb790f0d785500a8710e;hb=1fd5630e86bdbe3d476d9f5613fe20fd08112c5d;hpb=5b10d8fd7675ea51ed3da57105df359e18c84481 diff --git a/source/drv-api.c b/source/drv-api.c index 0ef289d..8bfe5fd 100644 --- a/source/drv-api.c +++ b/source/drv-api.c @@ -22,7 +22,6 @@ 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_init(sr_ctx, di, LOG_PREFIX); @@ -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) {