HACKING: Update URL to Linux kernel coding style.

[sigrok-cli.git] / session.c

diff --git a/session.c b/session.c
index edf3d12bdae898686c0c8e16123ed01d62f3a422..4b55544c610eac954c7427a37938d4b2db12504b 100644 (file)
--- a/session.c
+++ b/session.c
@@ -45,14 +45,14 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       if (sr_dev_config_capabilities(sdi, NULL, SR_CONF_LIMIT_MSEC)
+       if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_LIMIT_MSEC)
                        & SR_CONF_SET) {
                gvar = g_variant_new_uint64(time_msec);
                if (sr_config_set(sdi, NULL, SR_CONF_LIMIT_MSEC, gvar) != SR_OK) {
                        g_critical("Failed to configure time limit.");
                        return SR_ERR;
                }
-       } else if (sr_dev_config_capabilities(sdi, NULL, SR_CONF_SAMPLERATE)
+       } else if (sr_dev_config_capabilities_list(sdi, NULL, SR_CONF_SAMPLERATE)
                        & (SR_CONF_GET | SR_CONF_SET)) {
                /* Convert to samples based on the samplerate. */
                sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
@@ -175,6 +175,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
        uint64_t input_len;
        struct sr_dev_driver *driver;
 
+       /* Avoid warnings when building without decoder support. */
+       (void)session;
+       (void)input_len;
+
        driver = sr_dev_inst_driver_get(sdi);
 
        /* If the first packet to come in isn't a header, don't even try. */