X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=443d89ddc7166e95e39e71eefba9b16bcfc376ff;hb=4f0463a079f61ca60ac94a126a5a9cd0f40c14f3;hp=367474d87915465208408e520974eb74ef862e5a;hpb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 367474d8..443d89dd 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -619,8 +619,7 @@ static int config_set(uint32_t key, GVariant *data,
 	struct dev_context *devc;
 	uint64_t p;
 	double t_dbl;
-	unsigned int i;
-	int ret, idx;
+	int ret, idx, i;
 	const char *tmp_str;
 	char buffer[16];
 
@@ -632,7 +631,6 @@ static int config_set(uint32_t key, GVariant *data,
 		return SR_ERR;
 	}
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_FRAMES:
 		devc->limit_frames = g_variant_get_uint64(data);
@@ -642,8 +640,7 @@ static int config_set(uint32_t key, GVariant *data,
 			return SR_ERR_ARG;
 		g_free(devc->trigger_slope);
 		devc->trigger_slope = g_strdup((trigger_slopes[idx][0] == 'r') ? "POS" : "NEG");
-		ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope);
-		break;
+		return rigol_ds_config_set(sdi, ":TRIG:EDGE:SLOP %s", devc->trigger_slope);
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		t_dbl = g_variant_get_double(data);
 		if (t_dbl < 0.0 || t_dbl > 1.0) {
@@ -655,23 +652,21 @@ static int config_set(uint32_t key, GVariant *data,
 		 * need to express this in seconds. */
 		t_dbl = -(devc->horiz_triggerpos - 0.5) * devc->timebase * devc->num_timebases;
 		g_ascii_formatd(buffer, sizeof(buffer), "%.6f", t_dbl);
-		ret = rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer);
-		break;
+		return rigol_ds_config_set(sdi, ":TIM:OFFS %s", buffer);
 	case SR_CONF_TRIGGER_LEVEL:
 		t_dbl = g_variant_get_double(data);
 		g_ascii_formatd(buffer, sizeof(buffer), "%.3f", t_dbl);
 		ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:LEV %s", buffer);
 		if (ret == SR_OK)
 			devc->trigger_level = t_dbl;
-		break;
+		return ret;
 	case SR_CONF_TIMEBASE:
 		if ((idx = std_u64_tuple_idx(data, devc->timebases, devc->num_timebases)) < 0)
 			return SR_ERR_ARG;
 		devc->timebase = (float)devc->timebases[idx][0] / devc->timebases[idx][1];
 		g_ascii_formatd(buffer, sizeof(buffer), "%.9f",
 		                devc->timebase);
-		ret = rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer);
-		break;
+		return rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer);
 	case SR_CONF_TRIGGER_SOURCE:
 		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
 			return SR_ERR_ARG;
@@ -689,57 +684,40 @@ static int config_set(uint32_t key, GVariant *data,
 			tmp_str = "CHAN4";
 		else
 			tmp_str = (char *)devc->trigger_source;
-		ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
-		break;
+		return rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
 	case SR_CONF_VDIV:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg != devc->analog_groups[i])
-				continue;
-			if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
-				return SR_ERR_ARG;
-			devc->vdiv[i] = (float)vdivs[idx][0] / vdivs[idx][1];
-			g_ascii_formatd(buffer, sizeof(buffer), "%.3f",
-			                devc->vdiv[i]);
-			return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1,
-					buffer);
-		}
-		sr_dbg("Didn't set vdiv, unknown channel(group).");
-		return SR_ERR_NA;
+		if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+			return SR_ERR_ARG;
+		if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
+			return SR_ERR_ARG;
+		devc->vdiv[i] = (float)vdivs[idx][0] / vdivs[idx][1];
+		g_ascii_formatd(buffer, sizeof(buffer), "%.3f", devc->vdiv[i]);
+		return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1, buffer);
 	case SR_CONF_COUPLING:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg != devc->analog_groups[i])
-				continue;
-			if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
-				return SR_ERR_ARG;
-			g_free(devc->coupling[i]);
-			devc->coupling[i] = g_strdup(coupling[idx]);
-			return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1,
-					devc->coupling[i]);
-		}
-		sr_dbg("Didn't set coupling, unknown channel(group).");
-		return SR_ERR_NA;
+		if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+			return SR_ERR_ARG;
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
+			return SR_ERR_ARG;
+		g_free(devc->coupling[i]);
+		devc->coupling[i] = g_strdup(coupling[idx]);
+		return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1, devc->coupling[i]);
 	case SR_CONF_PROBE_FACTOR:
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
+		if ((i = std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels)) < 0)
+			return SR_ERR_ARG;
+		if ((idx = std_u64_idx(data, ARRAY_AND_SIZE(probe_factor))) < 0)
+			return SR_ERR_ARG;
 		p = g_variant_get_uint64(data);
-		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg != devc->analog_groups[i])
-				continue;
-			if ((idx = std_u64_idx(data, ARRAY_AND_SIZE(probe_factor))) < 0)
-				return SR_ERR_ARG;
-			devc->attenuation[i] = probe_factor[idx];
-			ret = rigol_ds_config_set(sdi, ":CHAN%d:PROB %"PRIu64,
-			                          i + 1, p);
-			if (ret == SR_OK)
-				rigol_ds_get_dev_cfg_vertical(sdi);
-			return ret;
-		}
-		sr_dbg("Didn't set probe factor, unknown channel(group).");
-		return SR_ERR_NA;
+		devc->attenuation[i] = probe_factor[idx];
+		ret = rigol_ds_config_set(sdi, ":CHAN%d:PROB %"PRIu64, i + 1, p);
+		if (ret == SR_OK)
+			rigol_ds_get_dev_cfg_vertical(sdi);
+		return ret;
 	case SR_CONF_DATA_SOURCE:
 		tmp_str = g_variant_get_string(data, NULL);
 		if (!strcmp(tmp_str, "Live"))
@@ -759,13 +737,12 @@ static int config_set(uint32_t key, GVariant *data,
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	unsigned int i;
 	struct dev_context *devc;
 
 	devc = (sdi) ? sdi->priv : NULL;
@@ -779,13 +756,10 @@ static int config_list(uint32_t key, GVariant **data,
 			*data = std_gvar_array_u32(NULL, 0);
 			return SR_OK;
 		} else {
-			for (i = 0; i < devc->model->analog_channels; i++) {
-				if (cg == devc->analog_groups[i]) {
-					*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
-					return SR_OK;
-				}
-			}
-			return SR_ERR_NA;
+			if (std_cg_idx(cg, devc->analog_groups, devc->model->analog_channels) < 0)
+				return SR_ERR_ARG;
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
+			return SR_OK;
 		}
 		break;
 	case SR_CONF_COUPLING: