drivers: Simplify some more trigger slope settings.

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index cdc4360e9a40b440099ae86e7ada37b46b63edcf..01ef47f8bd5dea781157438ef47d925c6dae864d 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -486,8 +486,7 @@ static int config_set(uint32_t key, GVariant *data,
                case SR_CONF_TRIGGER_SLOPE:
                        if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
                                return SR_ERR_ARG;
-                       devc->triggerslope = (trigger_slopes[idx][0] == 'r')
-                               ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+                       devc->triggerslope = idx;
                        break;
                case SR_CONF_HORIZ_TRIGGERPOS:
                        tmp_double = g_variant_get_double(data);
@@ -613,7 +612,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(num_samples * sizeof(float));
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;