X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcem-dt-885x%2Fapi.c;h=6db50a90d1b9cf38b9d879f03c03213ba9dca929;hb=9bf093011ae7692c4808d52f540b4be23b89ffcf;hp=18437ad4b1daf152795fa261f2047ce9eafb25b4;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c index 18437ad4..6db50a90 100644 --- a/src/hardware/cem-dt-885x/api.c +++ b/src/hardware/cem-dt-885x/api.c @@ -129,7 +129,6 @@ 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; - GVariant *range[2]; uint64_t low, high; int tmp, ret; @@ -139,7 +138,9 @@ static int config_get(uint32_t key, GVariant **data, return SR_ERR_ARG; devc = sdi->priv; + ret = SR_OK; + switch (key) { case SR_CONF_LIMIT_SAMPLES: *data = g_variant_new_uint64(devc->limit_samples); @@ -175,11 +176,8 @@ static int config_get(uint32_t key, GVariant **data, *data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN); break; case SR_CONF_SPL_MEASUREMENT_RANGE: - if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) { - range[0] = g_variant_new_uint64(low); - range[1] = g_variant_new_uint64(high); - *data = g_variant_new_tuple(range, 2); - } + if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) + *data = std_gvar_tuple_u64(low, high); break; case SR_CONF_POWER_OFF: *data = g_variant_new_boolean(FALSE); @@ -201,84 +199,53 @@ 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_u64, low, high; - unsigned int i; - int tmp, ret; - const char *tmp_str; + int tmp, idx; (void)cg; devc = sdi->priv; - ret = SR_OK; switch (key) { case SR_CONF_LIMIT_SAMPLES: - tmp_u64 = g_variant_get_uint64(data); - devc->limit_samples = tmp_u64; - ret = SR_OK; + devc->limit_samples = g_variant_get_uint64(data); break; case SR_CONF_DATALOG: - ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data)); - break; + return cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data)); case SR_CONF_SPL_WEIGHT_FREQ: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "A")) - ret = cem_dt_885x_weight_freq_set(sdi, - SR_MQFLAG_SPL_FREQ_WEIGHT_A); - else if (!strcmp(tmp_str, "C")) - ret = cem_dt_885x_weight_freq_set(sdi, - SR_MQFLAG_SPL_FREQ_WEIGHT_C); - else + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(weight_freq))) < 0) return SR_ERR_ARG; - break; + return cem_dt_885x_weight_freq_set(sdi, (weight_freq[idx][0] == 'A') ? + SR_MQFLAG_SPL_FREQ_WEIGHT_A : SR_MQFLAG_SPL_FREQ_WEIGHT_C); case SR_CONF_SPL_WEIGHT_TIME: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "F")) - ret = cem_dt_885x_weight_time_set(sdi, - SR_MQFLAG_SPL_TIME_WEIGHT_F); - else if (!strcmp(tmp_str, "S")) - ret = cem_dt_885x_weight_time_set(sdi, - SR_MQFLAG_SPL_TIME_WEIGHT_S); - else + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(weight_time))) < 0) return SR_ERR_ARG; - break; + return cem_dt_885x_weight_time_set(sdi, (weight_time[idx][0] == 'F') ? + SR_MQFLAG_SPL_TIME_WEIGHT_F : SR_MQFLAG_SPL_TIME_WEIGHT_S); case SR_CONF_HOLD_MAX: tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0; - ret = cem_dt_885x_holdmode_set(sdi, tmp); - break; + return cem_dt_885x_holdmode_set(sdi, tmp); case SR_CONF_HOLD_MIN: tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0; - ret = cem_dt_885x_holdmode_set(sdi, tmp); - break; + return cem_dt_885x_holdmode_set(sdi, tmp); case SR_CONF_SPL_MEASUREMENT_RANGE: - g_variant_get(data, "(tt)", &low, &high); - ret = SR_ERR_ARG; - for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) { - if (meas_ranges[i][0] == low && meas_ranges[i][1] == high) { - ret = cem_dt_885x_meas_range_set(sdi, low, high); - break; - } - } - break; + if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(meas_ranges))) < 0) + return SR_ERR_ARG; + return cem_dt_885x_meas_range_set(sdi, meas_ranges[idx][0], meas_ranges[idx][1]); case SR_CONF_POWER_OFF: if (g_variant_get_boolean(data)) - ret = cem_dt_885x_power_off(sdi); + return cem_dt_885x_power_off(sdi); break; case SR_CONF_DATA_SOURCE: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "Live")) - devc->cur_data_source = DATA_SOURCE_LIVE; - else if (!strcmp(tmp_str, "Memory")) - devc->cur_data_source = DATA_SOURCE_MEMORY; - else - return SR_ERR; - devc->enable_data_source_memory = devc->cur_data_source == DATA_SOURCE_MEMORY; + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(data_sources))) < 0) + return SR_ERR_ARG; + devc->cur_data_source = idx; + devc->enable_data_source_memory = (idx == DATA_SOURCE_MEMORY); break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_list(uint32_t key, GVariant **data,