X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkecheng-kc-330b%2Fapi.c;h=60b1164d4f8fa5ffd739f1dd48ca841885d86a44;hb=0c678b26dd8644b57dc8b2b6666eb7f362975841;hp=d264b56acf21462ec343715cb8778d52dacfd0a3;hpb=a162eeb2e8f23da99d1a7ca7d62dc6ad0981afc6;p=libsigrok.git

diff --git a/src/hardware/kecheng-kc-330b/api.c b/src/hardware/kecheng-kc-330b/api.c
index d264b56a..60b1164d 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -217,7 +217,6 @@ static int config_get(uint32_t key, GVariant **data,
 	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");
@@ -247,10 +246,7 @@ 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;
 
@@ -258,53 +254,31 @@ static int config_set(uint32_t key, GVariant *data,
 	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:
@@ -319,7 +293,7 @@ static int config_list(uint32_t key, GVariant **data,
 {
 	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(ARRAY_AND_SIZE(kecheng_kc_330b_sample_intervals));
 		break;
@@ -397,7 +371,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		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)))