From: Bert Vermeulen Date: Thu, 9 Jan 2014 12:08:32 +0000 (+0100) Subject: Add support for SR_CONF_MAX_UNCOMPRESSED_SAMPLES. X-Git-Tag: libsigrok-0.3.0~327 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=7730e4f002d6ae85fa2945e8a5752c639bfb0899;p=libsigrok.git Add support for SR_CONF_MAX_UNCOMPRESSED_SAMPLES. --- diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c index 6ebd73eb..0191d08b 100644 --- a/hardware/openbench-logic-sniffer/api.c +++ b/hardware/openbench-logic-sniffer/api.c @@ -37,6 +37,7 @@ 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" @@ -219,6 +220,7 @@ 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; @@ -245,6 +247,24 @@ 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; }