X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=6628d93d421d62c8a0e17cbf3a76ece6feb8fa2c;hb=66a435766721dd6ecdbce7b31a2f43c2e0752a12;hp=8a9d69c4842e49af3b0316b363ac3cb4c08f1297;hpb=cea26f6e9f1a58f28a4b790756a2f95dcf0eaa9d;p=libsigrok.git diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c index 8a9d69c4..6628d93d 100644 --- a/hardware/cem-dt-885x/api.c +++ b/hardware/cem-dt-885x/api.c @@ -144,11 +144,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) @@ -187,13 +183,16 @@ static int cleanup(void) return dev_clear(); } -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) { struct dev_context *devc; GVariant *range[2]; uint64_t low, high; int tmp, ret; + (void)probe_group; + if (!sdi) return SR_ERR_ARG; @@ -256,7 +255,8 @@ 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) { struct dev_context *devc; uint64_t tmp_u64, low, high; @@ -264,6 +264,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi) int tmp, ret; const char *tmp_str; + (void)probe_group; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -343,7 +345,8 @@ 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) { GVariant *tuple, *range[2]; GVariantBuilder gvb; @@ -351,6 +354,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) int ret; (void)sdi; + (void)probe_group; ret = SR_OK; switch (key) {