kingst-la2016: separate complex calls from caller's control flow

[libsigrok.git] / src / hardware / kingst-la2016 / api.c

diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c
index 4337bd0a879a4b63e4b1f059744d156762b28016..1163558e332b8662edf2586ea27e5c7130b2d877 100644 (file)
--- a/src/hardware/kingst-la2016/api.c
+++ b/src/hardware/kingst-la2016/api.c
@@ -191,7 +191,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        continue;
 
                /* USB identification matches, a device was found. */
-               sr_dbg("Found a LA2016 device.");
+               sr_dbg("Found a device (USB identification).");
                sdi = g_malloc0(sizeof(struct sr_dev_inst));
                sdi->status = SR_ST_INITIALIZING;
                sdi->connection_id = g_strdup(connection_id);
@@ -489,7 +489,8 @@ static int config_set(uint32_t key, GVariant *data,
                devc->threshold_voltage_idx = LOGIC_THRESHOLD_IDX_USER;
                break;
        case SR_CONF_LOGIC_THRESHOLD: {
-               if ((idx = std_str_idx(data, ARRAY_AND_SIZE(logic_threshold))) < 0)
+               idx = std_str_idx(data, ARRAY_AND_SIZE(logic_threshold));
+               if (idx < 0)
                        return SR_ERR_ARG;
                if (idx != LOGIC_THRESHOLD_IDX_USER) {
                        devc->threshold_voltage = logic_threshold_value[idx];
@@ -515,7 +516,8 @@ static int config_list(uint32_t key, GVariant **data,
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
        case SR_CONF_DEVICE_OPTIONS:
-               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+               return STD_CONFIG_LIST(key, data, sdi, cg,
+                       scanopts, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
                if (!sdi)
                        return SR_ERR_ARG;
@@ -527,7 +529,8 @@ static int config_list(uint32_t key, GVariant **data,
                }
                break;
        case SR_CONF_LIMIT_SAMPLES:
-               *data = std_gvar_tuple_u64(LA2016_NUM_SAMPLES_MIN, LA2016_NUM_SAMPLES_MAX);
+               *data = std_gvar_tuple_u64(LA2016_NUM_SAMPLES_MIN,
+                       LA2016_NUM_SAMPLES_MAX);
                break;
        case SR_CONF_VOLTAGE_THRESHOLD:
                *data = std_gvar_min_max_step_thresholds(
@@ -553,14 +556,11 @@ static int configure_channels(const struct sr_dev_inst *sdi)
 
        devc = sdi->priv;
        devc->cur_channels = 0;
-       devc->num_channels = 0;
-
        for (GSList *l = sdi->channels; l; l = l->next) {
                struct sr_channel *ch = (struct sr_channel*)l->data;
                if (ch->enabled == FALSE)
                        continue;
                devc->cur_channels |= 1 << ch->index;
-               devc->num_channels++;
        }
 
        return SR_OK;
@@ -583,12 +583,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        }
 
        devc->convbuffer_size = LA2016_CONVBUFFER_SIZE;
-       if (!(devc->convbuffer = g_try_malloc(devc->convbuffer_size))) {
+       devc->convbuffer = g_try_malloc(devc->convbuffer_size);
+       if (!devc->convbuffer) {
                sr_err("Cannot allocate conversion buffer.");
                return SR_ERR_MALLOC;
        }
 
-       if ((ret = la2016_setup_acquisition(sdi)) != SR_OK) {
+       ret = la2016_setup_acquisition(sdi);
+       if (ret != SR_OK) {
                g_free(devc->convbuffer);
                devc->convbuffer = NULL;
                return ret;
@@ -596,12 +598,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
        devc->ctx = drvc->sr_ctx;
 
-       if ((ret = la2016_start_acquisition(sdi)) != SR_OK) {
+       ret = la2016_start_acquisition(sdi);
+       if (ret != SR_OK) {
                la2016_abort_acquisition(sdi);
                return ret;
        }
 
-       devc->have_trigger = 0;
+       devc->completion_seen = FALSE;
        usb_source_add(sdi->session, drvc->sr_ctx, 50,
                la2016_receive_data, (void *)sdi);