Enforce open device before config_set()/dev_acquisition_start()

[libsigrok.git] / hardware / alsa / api.c

diff --git a/hardware/alsa/api.c b/hardware/alsa/api.c
index e2efbf468dc944b21f56f7ac7b91808c4552d39f..43d9b51b5543484605f11826682f076ad8e4f27e 100644 (file)
--- a/hardware/alsa/api.c
+++ b/hardware/alsa/api.c
@@ -27,11 +27,10 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
        SR_CONF_SAMPLERATE,
        SR_CONF_LIMIT_SAMPLES,
        SR_CONF_CONTINUOUS,
-       0,
 };
 
 SR_PRIV struct sr_dev_driver alsa_driver_info;
@@ -93,6 +92,8 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
+       sdi->status = SR_ST_ACTIVE;
+
        return SR_OK;
 }
 
@@ -109,6 +110,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
                        sr_err("Failed to close device: %s.",
                               snd_strerror(ret));
                        devc->capture_handle = NULL;
+            sdi->status = SR_ST_INACTIVE;
                }
        } else {
                sr_dbg("No capture handle, no need to close audio device.");
@@ -124,65 +126,77 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
+static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
                devc = sdi->priv;
-               *data = &devc->cur_samplerate;
+               *data = g_variant_new_uint64(devc->cur_samplerate);
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
 }
 
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
        devc = sdi->priv;
 
        switch (id) {
        case SR_CONF_SAMPLERATE:
-               alsa_set_samplerate(sdi, *(const uint64_t *)value);
+               alsa_set_samplerate(sdi, g_variant_get_uint64(data));
                break;
        case SR_CONF_LIMIT_SAMPLES:
-               devc->limit_samples = *(const uint64_t *)value;
+               devc->limit_samples = g_variant_get_uint64(data);
                break;
        default:
-               sr_err("Unknown capability: %d.", id);
-               return SR_ERR;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
 }
 
-static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       GVariant *gvar;
+       GVariantBuilder gvb;
+       int i;
 
        (void)sdi;
 
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               *data = hwcaps;
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                               hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
                break;
        case SR_CONF_SAMPLERATE:
                if (!sdi || !sdi->priv)
                        return SR_ERR_ARG;
                devc = sdi->priv;
-               if (!devc->supp_rates.list) {
+               if (!devc->samplerates) {
                        sr_err("Instance did not contain a samplerate list.");
                        return SR_ERR_ARG;
                }
-               *data = &devc->supp_rates;
+               for (i = 0; devc->samplerates[i]; i++)
+                       ;
+               g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
+               gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
+                               devc->samplerates, i, sizeof(uint64_t));
+               g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
+               *data = g_variant_builder_end(&gvb);
                break;
        default:
-               return SR_ERR_ARG;
+               return SR_ERR_NA;
        }
 
        return SR_OK;
@@ -195,6 +209,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        int count, ret;
        char *endianness;
 
+       if (sdi->status != SR_ST_ACTIVE)
+               return SR_ERR_DEV_CLOSED;
+
        devc = sdi->priv;
        devc->cb_data = cb_data;
        devc->num_samples = 0;