Fix various gcc 8 compiler warnings related to ARRAY_SIZE.

[libsigrok.git] / src / hardware / asix-sigma / api.c

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index a48d7211f04d60c8e9670ff165249b1a40b97445..89783456c5bbe416ed5fcc8c3945eb9093400181 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -156,8 +156,8 @@ static int dev_close(struct sr_dev_inst *sdi)
        return (ftdi_usb_close(&devc->ftdic) == 0) ? SR_OK : SR_ERR;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -189,55 +189,44 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       uint64_t tmp;
-       int ret;
 
        (void)cg;
 
        devc = sdi->priv;
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_SAMPLERATE:
-               ret = sigma_set_samplerate(sdi, g_variant_get_uint64(data));
-               break;
+               return sigma_set_samplerate(sdi, g_variant_get_uint64(data));
        case SR_CONF_LIMIT_MSEC:
-               tmp = g_variant_get_uint64(data);
-               if (tmp > 0)
-                       devc->limit_msec = g_variant_get_uint64(data);
-               else
-                       ret = SR_ERR;
+               devc->limit_msec = g_variant_get_uint64(data);
                break;
        case SR_CONF_LIMIT_SAMPLES:
-               tmp = g_variant_get_uint64(data);
-               devc->limit_samples = tmp;
-               devc->limit_msec = sigma_limit_samples_to_msec(devc, tmp);
+               devc->limit_samples = g_variant_get_uint64(data);
+               devc->limit_msec = sigma_limit_samples_to_msec(devc,
+                                               devc->limit_samples);
                break;
 #if ASIX_SIGMA_WITH_TRIGGER
        case SR_CONF_CAPTURE_RATIO:
-               tmp = g_variant_get_uint64(data);
-               if (tmp > 100)
-                       return SR_ERR;
-               devc->capture_ratio = tmp;
+               devc->capture_ratio = g_variant_get_uint64(data);
                break;
 #endif
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        switch (key) {
        case SR_CONF_DEVICE_OPTIONS:
-               return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+               return STD_CONFIG_LIST(key, data, sdi, cg, NO_OPTS, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
                *data = std_gvar_samplerates(samplerates, samplerates_count);
                break;
@@ -374,9 +363,20 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        devc = sdi->priv;
-       devc->state.state = SIGMA_IDLE;
 
-       sr_session_source_remove(sdi->session, -1);
+       /*
+        * When acquisition is currently running, keep the receive
+        * routine registered and have it stop the acquisition upon the
+        * next invocation. Else unregister the receive routine here
+        * already. The detour is required to have sample data retrieved
+        * for forced acquisition stops.
+        */
+       if (devc->state.state == SIGMA_CAPTURE) {
+               devc->state.state = SIGMA_STOPPING;
+       } else {
+               devc->state.state = SIGMA_IDLE;
+               sr_session_source_remove(sdi->session, -1);
+       }
 
        return SR_OK;
 }