X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Flink-mso19%2Fapi.c;h=923867e38abd300969cf2f55f829eaffd77a13bd;hb=7d40b5ee62f625a87e7ab37508d37b97a65dc66b;hp=793ec53995be79664750b3be44b26fcd8cf0bb92;hpb=758906aa711c2936e7e9adcb449f70905087a5d9;p=libsigrok.git diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c index 793ec539..923867e3 100644 --- a/src/hardware/link-mso19/api.c +++ b/src/hardware/link-mso19/api.c @@ -53,6 +53,10 @@ static const uint64_t samplerates[] = { SR_HZ(100), }; +static const char *trigger_slopes[2] = { + "r", "f", +}; + static GSList *scan(struct sr_dev_driver *di, GSList *options) { int i; @@ -253,14 +257,9 @@ static int config_set(int key, GVariant *data, case SR_CONF_CAPTURE_RATIO: break; case SR_CONF_TRIGGER_SLOPE: - slope = g_variant_get_string(data, NULL); - - if (!slope || !(slope[0] == 'f' || slope[0] == 'r')) - sr_err("Invalid trigger slope"); + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0) return SR_ERR_ARG; - } - devc->trigger_slope = (slope[0] == 'r') - ? SLOPE_POSITIVE : SLOPE_NEGATIVE; + devc->trigger_slope = idx; break; case SR_CONF_HORIZ_TRIGGERPOS: pos = g_variant_get_double(data);