Only save enabled channels to a session file.

[libsigrok.git] / src / hardware / pipistrello-ols / api.c

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 892821793bca73c15ae2aff28d145749ba409ca7..acbfcda0289606b66be4086ae0ef8c62fc7a6215 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -19,16 +19,16 @@
 
 #include "protocol.h"
 
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
        SR_CONF_LOGIC_ANALYZER,
-       SR_CONF_SAMPLERATE,
-       SR_CONF_TRIGGER_MATCH,
-       SR_CONF_CAPTURE_RATIO,
-       SR_CONF_LIMIT_SAMPLES,
-       SR_CONF_PATTERN_MODE,
-       SR_CONF_EXTERNAL_CLOCK,
-       SR_CONF_SWAP,
-       SR_CONF_RLE,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+       SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_SWAP | SR_CONF_SET,
+       SR_CONF_RLE | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const int32_t trigger_matches[] = {
@@ -100,10 +100,7 @@ static GSList *scan(GSList *options)
        devices = NULL;
 
        /* Allocate memory for our private device context. */
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               goto err_free_nothing;
-       }
+       devc = g_malloc0(sizeof(struct dev_context));
 
        /* Device-specific settings */
        devc->max_samplebytes = devc->max_samplerate = devc->protocol_version = 0;
@@ -185,7 +182,6 @@ static GSList *scan(GSList *options)
 
        /* Parse the metadata. */
        sdi = p_ols_get_metadata((uint8_t *)buf, bytes_read, devc);
-       sdi->index = 0;
 
        /* Configure samplerate and divider. */
        if (p_ols_set_samplerate(sdi, DEFAULT_SAMPLERATE) != SR_OK)
@@ -205,7 +201,6 @@ err_free_ftdi_buf:
        g_free(devc->ftdi_buf);
 err_free_devc:
        g_free(devc);
-err_free_nothing:
 
        return NULL;
 }
@@ -388,7 +383,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               hwcaps, ARRAY_SIZE(hwcaps), sizeof(uint32_t));
+                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                break;
        case SR_CONF_SAMPLERATE:
                g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));