X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=60b1164d4f8fa5ffd739f1dd48ca841885d86a44;hp=50986802c4fec034ea6ac4c6ff78ce0f02b65380;hb=HEAD;hpb=b15ff1c92aabeea04649de25a3a01f851ab0a1ec diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c index 50986802..60b1164d 100644 --- a/src/hardware/kecheng-kc-330b/api.c +++ b/src/hardware/kecheng-kc-330b/api.c @@ -197,11 +197,10 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -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; - GVariant *rational[2]; const uint64_t *si; (void)cg; @@ -213,14 +212,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s break; case SR_CONF_SAMPLE_INTERVAL: si = kecheng_kc_330b_sample_intervals[devc->sample_interval]; - rational[0] = g_variant_new_uint64(si[0]); - rational[1] = g_variant_new_uint64(si[1]); - *data = g_variant_new_tuple(rational, 2); + *data = std_gvar_tuple_u64(si[0], si[1]); break; case SR_CONF_DATALOG: /* There really isn't a way to be sure the device is logging. */ return SR_ERR_NA; - break; case SR_CONF_SPL_WEIGHT_FREQ: if (devc->mqflags & SR_MQFLAG_SPL_FREQ_WEIGHT_A) *data = g_variant_new_string("A"); @@ -246,14 +242,11 @@ 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 p, q; - unsigned int i; - int tmp; - const char *tmp_str; + int idx; (void)cg; @@ -261,53 +254,31 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_SAMPLES: devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); break; case SR_CONF_SAMPLE_INTERVAL: - g_variant_get(data, "(tt)", &p, &q); - for (i = 0; i < ARRAY_SIZE(kecheng_kc_330b_sample_intervals); i++) { - if (kecheng_kc_330b_sample_intervals[i][0] != p || kecheng_kc_330b_sample_intervals[i][1] != q) - continue; - devc->sample_interval = i; - devc->config_dirty = TRUE; - break; - } - if (i == ARRAY_SIZE(kecheng_kc_330b_sample_intervals)) + if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(kecheng_kc_330b_sample_intervals))) < 0) return SR_ERR_ARG; + devc->sample_interval = idx; + devc->config_dirty = TRUE; break; case SR_CONF_SPL_WEIGHT_FREQ: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "A")) - tmp = SR_MQFLAG_SPL_FREQ_WEIGHT_A; - else if (!strcmp(tmp_str, "C")) - tmp = SR_MQFLAG_SPL_FREQ_WEIGHT_C; - else + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(weight_freq))) < 0) return SR_ERR_ARG; devc->mqflags &= ~(SR_MQFLAG_SPL_FREQ_WEIGHT_A | SR_MQFLAG_SPL_FREQ_WEIGHT_C); - devc->mqflags |= tmp; + devc->mqflags |= (weight_freq[idx][0] == 'A') ? SR_MQFLAG_SPL_FREQ_WEIGHT_A : SR_MQFLAG_SPL_FREQ_WEIGHT_C; devc->config_dirty = TRUE; break; case SR_CONF_SPL_WEIGHT_TIME: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "F")) - tmp = SR_MQFLAG_SPL_TIME_WEIGHT_F; - else if (!strcmp(tmp_str, "S")) - tmp = SR_MQFLAG_SPL_TIME_WEIGHT_S; - else + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(weight_time))) < 0) return SR_ERR_ARG; devc->mqflags &= ~(SR_MQFLAG_SPL_TIME_WEIGHT_F | SR_MQFLAG_SPL_TIME_WEIGHT_S); - devc->mqflags |= tmp; + devc->mqflags |= (weight_time[idx][0] == 'F') ? SR_MQFLAG_SPL_TIME_WEIGHT_F : SR_MQFLAG_SPL_TIME_WEIGHT_S; devc->config_dirty = TRUE; break; case SR_CONF_DATA_SOURCE: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "Live")) - devc->data_source = DATA_SOURCE_LIVE; - else if (!strcmp(tmp_str, "Memory")) - devc->data_source = DATA_SOURCE_MEMORY; - else - return SR_ERR; + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(data_sources))) < 0) + return SR_ERR_ARG; + devc->data_source = idx; devc->config_dirty = TRUE; break; default: @@ -317,15 +288,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd 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_SAMPLE_INTERVAL: - *data = std_gvar_tuple_array(&kecheng_kc_330b_sample_intervals, - ARRAY_SIZE(kecheng_kc_330b_sample_intervals)); + *data = std_gvar_tuple_array(ARRAY_AND_SIZE(kecheng_kc_330b_sample_intervals)); break; case SR_CONF_SPL_WEIGHT_FREQ: *data = g_variant_new_strv(ARRAY_AND_SIZE(weight_freq)); @@ -352,7 +322,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_datafeed_meta meta; struct sr_config *src; struct sr_usb_dev_inst *usb; - GVariant *gvar, *rational[2]; + GVariant *gvar; const uint64_t *si; int req_len, buf_len, len, ret; unsigned char buf[9]; @@ -394,15 +364,15 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->stored_samples = devc->limit_samples; si = kecheng_kc_330b_sample_intervals[buf[1]]; - rational[0] = g_variant_new_uint64(si[0]); - rational[1] = g_variant_new_uint64(si[1]); - gvar = g_variant_new_tuple(rational, 2); + gvar = std_gvar_tuple_u64(si[0], si[1]); + src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, gvar); packet.type = SR_DF_META; packet.payload = &meta; meta.config = g_slist_append(NULL, src); sr_session_send(sdi, &packet); - g_free(src); + g_slist_free(meta.config); + sr_config_free(src); } if (!(devc->xfer = libusb_alloc_transfer(0)))