probe_groups: API changes required to implement probe groups.

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 62001a5b8f98e8d9edd4636bab2193d2c822e869..6628d93d421d62c8a0e17cbf3a76ece6feb8fa2c 100644 (file)
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -183,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;
 
@@ -252,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;
@@ -260,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;
 
@@ -339,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;
@@ -347,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) {

diff --git a/hardware/center-3xx/api.c b/hardware/center-3xx/api.c
index 6c01f4ca1facc3ea7bad55ca6c7aa532e71f4ff6..4cd8ab122fa17b4a09196fea2b1fbfe5e0524b13 100644 (file)
--- a/hardware/center-3xx/api.c
+++ b/hardware/center-3xx/api.c
@@ -186,10 +186,13 @@ static int cleanup(int idx)
        return dev_clear(idx);
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -213,9 +216,11 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:

diff --git a/hardware/ikalogic-scanalogic2/api.c b/hardware/ikalogic-scanalogic2/api.c
index 4f1d09fbe50e0a47d38dc48122b2fa5bb13d6eab..1fe869c38d4c7b4ce8db9300e0a0cc9ddf2e8b53 100644 (file)
--- a/hardware/ikalogic-scanalogic2/api.c
+++ b/hardware/ikalogic-scanalogic2/api.c
@@ -307,11 +307,14 @@ 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;
        int ret;
 
+       (void)probe_group;
+
        ret = SR_OK;
        devc = sdi->priv;
 
@@ -329,11 +332,14 @@ 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)
 {
        uint64_t samplerate, limit_samples, capture_ratio;
        int ret;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -359,13 +365,15 @@ 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 *gvar;
        GVariantBuilder gvb;
        int ret;
 
        (void)sdi;
+       (void)probe_group;
 
        ret = SR_OK;
 

diff --git a/hardware/ikalogic-scanaplus/api.c b/hardware/ikalogic-scanaplus/api.c
index 4d411b631281305f27f461ef0d3443cd60bfcd63..ba5b1b1103c8cc9571f5266f9483d15171ad7cbb 100644 (file)
--- a/hardware/ikalogic-scanaplus/api.c
+++ b/hardware/ikalogic-scanaplus/api.c
@@ -279,9 +279,11 @@ static int cleanup(void)
        return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
@@ -295,10 +297,13 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+               const struct sr_probe_group *probe_group)
 {
        struct dev_context *devc;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -329,12 +334,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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 *gvar;
        GVariantBuilder gvb;
 
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:

diff --git a/hardware/kecheng-kc-330b/api.c b/hardware/kecheng-kc-330b/api.c
index 02f4b0e01dab72f87981b0fe51511d771df87f61..9355e6dcce922b62b75f46db919a691095ef3103 100644 (file)
--- a/hardware/kecheng-kc-330b/api.c
+++ b/hardware/kecheng-kc-330b/api.c
@@ -252,12 +252,15 @@ static int cleanup(void)
        return ret;
 }
 
-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 *rational[2];
        const uint64_t *si;
 
+       (void)probe_group;
+
        devc = sdi->priv;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -298,7 +301,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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 p, q;
@@ -306,6 +310,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;
 
@@ -375,13 +381,15 @@ 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, *rational[2];
        GVariantBuilder gvb;
        unsigned int i;
 
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:

diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c
index 991a839b5adbb910f04bd46a89fc7d27470a8db6..6523e93a8276bea60fb93bcc6264f95e7ba6c6d0 100644 (file)
--- a/hardware/norma-dmm/api.c
+++ b/hardware/norma-dmm/api.c
@@ -207,10 +207,13 @@ static int cleanup(void)
        return dev_clear();
 }
 
-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;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -242,9 +245,11 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index dfcbe047f8ea3674794d977367d27a0f66bab0a0..e399729e9b09d9d5a9dae883cc42ca744c0135f6 100644 (file)
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -431,7 +431,8 @@ static int cleanup(void)
        return ret;
 }
 
-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;
        struct sr_usb_dev_inst *usb;
@@ -440,6 +441,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
        int ret;
        unsigned int i;
 
+       (void)probe_group;
+
        ret = SR_OK;
        switch (key) {
        case SR_CONF_CONN:
@@ -482,13 +485,16 @@ 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;
        gdouble low, high;
        int ret;
        unsigned int i;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -522,7 +528,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 *gvar, *range[2];
        GVariantBuilder gvb;
@@ -530,6 +537,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
        unsigned int i;
 
        (void)sdi;
+       (void)probe_group;
 
        ret = SR_OK;
        switch (key) {

diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c
index 604dec7c7b2a53bb0e0bac386696b94e61506137..d129987d9d9fc8e93a9f0bff76789b0ac04572d6 100644 (file)
--- a/hardware/teleinfo/api.c
+++ b/hardware/teleinfo/api.c
@@ -203,10 +203,13 @@ static int cleanup(void)
        return dev_clear();
 }
 
-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;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -231,9 +234,11 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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)
 {
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:

diff --git a/hardware/uni-t-ut32x/api.c b/hardware/uni-t-ut32x/api.c
index c3ef49a72ed0af440431c5dc0727677621f99aca..8d4e722125fffbe29fe35805b11bc30b5003009d 100644 (file)
--- a/hardware/uni-t-ut32x/api.c
+++ b/hardware/uni-t-ut32x/api.c
@@ -203,10 +203,13 @@ static int cleanup(void)
        return ret;
 }
 
-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;
 
+       (void)probe_group;
+
        devc = sdi->priv;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -225,12 +228,15 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-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;
        int ret;
        const char *tmp_str;
 
+       (void)probe_group;
+
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -263,10 +269,12 @@ 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)
 {
 
        (void)sdi;
+       (void)probe_group;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 8029da1b9d2916bdcab58ec11a9296c1f3ee6662..54fbfa34804db2736c323600dcf53c2d46c3c1db 100644 (file)
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -121,8 +121,8 @@ static int init(struct sr_output *o)
        }
        ctx->unitsize = (ctx->num_enabled_probes + 7) / 8;
 
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
                ctx->samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
        } else

diff --git a/output/csv.c b/output/csv.c
index 57cfb821e836b7aec0be00c81112a68381730113..3eda9bf99a95f62df5a966ff933e1861782dd020 100644 (file)
--- a/output/csv.c
+++ b/output/csv.c
@@ -91,8 +91,8 @@ static int init(struct sr_output *o)
 
        num_probes = g_slist_length(o->sdi->probes);
 
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
                ctx->samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
        } else

diff --git a/output/gnuplot.c b/output/gnuplot.c
index 23e0212b28a12e71addbbb18177134acd51d8dfd..e93556f834b0aebed65a7b8a75f110ae8b99f6ba 100644 (file)
--- a/output/gnuplot.c
+++ b/output/gnuplot.c
@@ -95,8 +95,8 @@ static int init(struct sr_output *o)
        num_probes = g_slist_length(o->sdi->probes);
        comment[0] = '\0';
        samplerate = 0;
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
                samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
                if (!(frequency_s = sr_samplerate_string(samplerate))) {

diff --git a/output/text/text.c b/output/text/text.c
index a2b8b20ec0962ee2baf11e000d5e549c2ecb57e9..9be3397400f41c56c384c9bc8874d23337946ab0 100644 (file)
--- a/output/text/text.c
+++ b/output/text/text.c
@@ -129,8 +129,8 @@ SR_PRIV int init(struct sr_output *o, int default_spl, enum outputmode mode)
 
        snprintf(ctx->header, 511, "%s\n", PACKAGE_STRING);
        num_probes = g_slist_length(o->sdi->probes);
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
                samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
                if (!(samplerate_s = sr_samplerate_string(samplerate))) {

diff --git a/output/vcd.c b/output/vcd.c
index 04d7fcbbb1a60103c20f9f16b47d33a8c230f6c4..8e2d1b2191d9e1f77825a58c9cdec33aeeac2e83 100644 (file)
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -95,8 +95,8 @@ static int init(struct sr_output *o)
        g_string_append_printf(ctx->header, "$version %s %s $end\n",
                        PACKAGE, PACKAGE_VERSION);
 
-       if (sr_config_get(o->sdi->driver, SR_CONF_SAMPLERATE, &gvar,
-                       o->sdi) == SR_OK) {
+       if (sr_config_get(o->sdi->driver, o->sdi, NULL, SR_CONF_SAMPLERATE,
+                       &gvar) == SR_OK) {
                ctx->samplerate = g_variant_get_uint64(gvar);
                g_variant_unref(gvar);
                if (!((samplerate_s = sr_samplerate_string(ctx->samplerate)))) {