X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=ff48d4ddebe94a1c54ab6d0b2bbd83b9be59584d;hb=889ef4a01cbf50d381cda0a1331b794a2c6d26c8;hp=0191d08bc1d22b7967957325fb9edf338a79ba6e;hpb=7730e4f002d6ae85fa2945e8a5752c639bfb0899;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c index 0191d08b..ff48d4dd 100644 --- a/hardware/openbench-logic-sniffer/api.c +++ b/hardware/openbench-logic-sniffer/api.c @@ -37,7 +37,6 @@ static const int32_t hwcaps[] = { SR_CONF_PATTERN_MODE, SR_CONF_SWAP, SR_CONF_RLE, - SR_CONF_MAX_UNCOMPRESSED_SAMPLES, }; #define STR_PATTERN_EXTERNAL "external" @@ -220,7 +219,6 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_probe_group *probe_group) { struct dev_context *devc; - int num_channels, i; (void)probe_group; @@ -247,24 +245,6 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_RLE: *data = g_variant_new_boolean(devc->flag_reg & FLAG_RLE ? TRUE : FALSE); break; - case SR_CONF_MAX_UNCOMPRESSED_SAMPLES: - if (devc->flag_reg & FLAG_RLE) - return SR_ERR_NA; - if (devc->max_samples == 0) - /* Device didn't specify sample memory size in metadata. */ - return SR_ERR_NA; - /* - * Channel groups are turned off if no probes in that group are - * enabled, making more room for samples for the enabled group. - */ - ols_configure_probes(sdi); - num_channels = 0; - for (i = 0; i < 4; i++) { - if (devc->probe_mask & (0xff << (i * 8))) - num_channels++; - } - *data = g_variant_new_uint64(devc->max_samples / num_channels); - break; default: return SR_ERR_NA; } @@ -363,10 +343,11 @@ static int config_set(int id, 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; + struct dev_context *devc; + GVariant *gvar, *grange[2]; GVariantBuilder gvb; + int num_channels, i; - (void)sdi; (void)probe_group; switch (key) { @@ -391,6 +372,29 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, case SR_CONF_PATTERN_MODE: *data = g_variant_new_strv(patterns, ARRAY_SIZE(patterns)); break; + case SR_CONF_LIMIT_SAMPLES: + if (!sdi) + return SR_ERR_ARG; + devc = sdi->priv; + if (devc->flag_reg & FLAG_RLE) + return SR_ERR_NA; + if (devc->max_samples == 0) + /* Device didn't specify sample memory size in metadata. */ + return SR_ERR_NA; + /* + * Channel groups are turned off if no probes in that group are + * enabled, making more room for samples for the enabled group. + */ + ols_configure_probes(sdi); + num_channels = 0; + for (i = 0; i < 4; i++) { + if (devc->probe_mask & (0xff << (i * 8))) + num_channels++; + } + grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES); + grange[1] = g_variant_new_uint64(devc->max_samples / num_channels); + *data = g_variant_new_tuple(grange, 2); + break; default: return SR_ERR_NA; }