X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frigol-ds%2Fapi.c;h=367474d87915465208408e520974eb74ef862e5a;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=72f41b4c75cbf70b82a9d1884e5fa7fd2b60bd4c;hpb=53012da658ae94b245240c8a3e115723eede4c7d;p=libsigrok.git

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 72f41b4c..367474d8 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -126,56 +126,23 @@ static const uint64_t vdivs[][2] = {
 	{ 100, 1 },
 };
 
-#define NUM_TIMEBASE  ARRAY_SIZE(timebases)
-#define NUM_VDIV      ARRAY_SIZE(vdivs)
-
 static const char *trigger_sources[] = {
-	"CH1",
-	"CH2",
-	"CH3",
-	"CH4",
-	"EXT",
-	"AC Line",
-	"D0",
-	"D1",
-	"D2",
-	"D3",
-	"D4",
-	"D5",
-	"D6",
-	"D7",
-	"D8",
-	"D9",
-	"D10",
-	"D11",
-	"D12",
-	"D13",
-	"D14",
-	"D15",
+	"CH1", "CH2", "CH3", "CH4",
+	"EXT", "AC Line",
+	"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+	"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
 };
 
 static const char *trigger_slopes[] = {
-	"r",
-	"f",
+	"r", "f",
 };
 
 static const char *coupling[] = {
-	"AC",
-	"DC",
-	"GND",
+	"AC", "DC", "GND",
 };
 
 static const uint64_t probe_factor[] = {
-	1,
-	2,
-	5,
-	10,
-	20,
-	50,
-	100,
-	200,
-	500,
-	1000,
+	1, 2, 5, 10, 20, 50, 100, 200, 500, 1000,
 };
 
 /* Do not change the order of entries */
@@ -206,8 +173,8 @@ static const struct rigol_ds_vendor supported_vendors[] = {
 };
 
 #define VENDOR(x) &supported_vendors[x]
-/* vendor, series, protocol, max timebase, min vdiv, number of horizontal divs,
- * live waveform samples, memory buffer samples */
+/* vendor, series/name, protocol, data format, max timebase, min vdiv,
+ * number of horizontal divs, live waveform samples, memory buffer samples */
 static const struct rigol_ds_series supported_series[] = {
 	[VS5000] = {VENDOR(RIGOL), "VS5000", PROTOCOL_V1, FORMAT_RAW,
 		{50, 1}, {2, 1000}, 14, 2048, 0},
@@ -397,18 +364,18 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 				devc->digital_group);
 	}
 
-	for (i = 0; i < NUM_TIMEBASE; i++) {
+	for (i = 0; i < ARRAY_SIZE(timebases); i++) {
 		if (!memcmp(&devc->model->min_timebase, &timebases[i], sizeof(uint64_t[2])))
 			devc->timebases = &timebases[i];
 		if (!memcmp(&devc->model->series->max_timebase, &timebases[i], sizeof(uint64_t[2])))
 			devc->num_timebases = &timebases[i] - devc->timebases + 1;
 	}
 
-	for (i = 0; i < NUM_VDIV; i++) {
+	for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
 		if (!memcmp(&devc->model->series->min_vdiv,
 					&vdivs[i], sizeof(uint64_t[2]))) {
 			devc->vdivs = &vdivs[i];
-			devc->num_vdivs = NUM_VDIV - i;
+			devc->num_vdivs = ARRAY_SIZE(vdivs) - i;
 		}
 	}
 
@@ -502,8 +469,8 @@ static int digital_frame_size(const struct sr_dev_inst *sdi)
 	}
 }
 
-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;
 	struct sr_channel *ch;
@@ -646,14 +613,14 @@ 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;
+	uint64_t p;
 	double t_dbl;
-	unsigned int i, j;
-	int ret;
+	unsigned int i;
+	int ret, idx;
 	const char *tmp_str;
 	char buffer[16];
 
@@ -671,16 +638,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 		devc->limit_frames = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
-		tmp_str = g_variant_get_string(data, NULL);
-
-		if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r')) {
-			sr_err("Unknown trigger slope: '%s'.",
-			       (tmp_str) ? tmp_str : "NULL");
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
 			return SR_ERR_ARG;
-		}
-
 		g_free(devc->trigger_slope);
-		devc->trigger_slope = g_strdup((tmp_str[0] == 'r') ? "POS" : "NEG");
+		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;
 	case SR_CONF_HORIZ_TRIGGERPOS:
@@ -704,114 +665,78 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 			devc->trigger_level = t_dbl;
 		break;
 	case SR_CONF_TIMEBASE:
-		g_variant_get(data, "(tt)", &p, &q);
-		for (i = 0; i < devc->num_timebases; i++) {
-			if (devc->timebases[i][0] == p && devc->timebases[i][1] == q) {
-				devc->timebase = (float)p / q;
-				g_ascii_formatd(buffer, sizeof(buffer), "%.9f",
-				                devc->timebase);
-				ret = rigol_ds_config_set(sdi, ":TIM:SCAL %s", buffer);
-				break;
-			}
-		}
-		if (i == devc->num_timebases) {
-			sr_err("Invalid timebase index: %d.", i);
-			ret = SR_ERR_ARG;
-		}
+		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;
 	case SR_CONF_TRIGGER_SOURCE:
-		tmp_str = g_variant_get_string(data, NULL);
-		for (i = 0; i < ARRAY_SIZE(trigger_sources); i++) {
-			if (!strcmp(trigger_sources[i], tmp_str)) {
-				g_free(devc->trigger_source);
-				devc->trigger_source = g_strdup(trigger_sources[i]);
-				if (!strcmp(devc->trigger_source, "AC Line"))
-					tmp_str = "ACL";
-				else if (!strcmp(devc->trigger_source, "CH1"))
-					tmp_str = "CHAN1";
-				else if (!strcmp(devc->trigger_source, "CH2"))
-					tmp_str = "CHAN2";
-				else if (!strcmp(devc->trigger_source, "CH3"))
-					tmp_str = "CHAN3";
-				else if (!strcmp(devc->trigger_source, "CH4"))
-					tmp_str = "CHAN4";
-				else
-					tmp_str = (char *)devc->trigger_source;
-				ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
-				break;
-			}
-		}
-		if (i == ARRAY_SIZE(trigger_sources)) {
-			sr_err("Invalid trigger source index: %d.", i);
-			ret = SR_ERR_ARG;
-		}
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
+			return SR_ERR_ARG;
+		g_free(devc->trigger_source);
+		devc->trigger_source = g_strdup(trigger_sources[idx]);
+		if (!strcmp(devc->trigger_source, "AC Line"))
+			tmp_str = "ACL";
+		else if (!strcmp(devc->trigger_source, "CH1"))
+			tmp_str = "CHAN1";
+		else if (!strcmp(devc->trigger_source, "CH2"))
+			tmp_str = "CHAN2";
+		else if (!strcmp(devc->trigger_source, "CH3"))
+			tmp_str = "CHAN3";
+		else if (!strcmp(devc->trigger_source, "CH4"))
+			tmp_str = "CHAN4";
+		else
+			tmp_str = (char *)devc->trigger_source;
+		ret = rigol_ds_config_set(sdi, ":TRIG:EDGE:SOUR %s", tmp_str);
 		break;
 	case SR_CONF_VDIV:
-		if (!cg) {
-			sr_err("No channel group specified.");
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		}
-		g_variant_get(data, "(tt)", &p, &q);
 		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg == devc->analog_groups[i]) {
-				for (j = 0; j < ARRAY_SIZE(vdivs); j++) {
-					if (vdivs[j][0] != p || vdivs[j][1] != q)
-						continue;
-					devc->vdiv[i] = (float)p / q;
-					g_ascii_formatd(buffer, sizeof(buffer), "%.3f",
-					                devc->vdiv[i]);
-					return rigol_ds_config_set(sdi, ":CHAN%d:SCAL %s", i + 1,
-							buffer);
-				}
-				sr_err("Invalid vdiv index: %d.", j);
+			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;
 	case SR_CONF_COUPLING:
-		if (!cg) {
-			sr_err("No channel group specified.");
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		}
-		tmp_str = g_variant_get_string(data, NULL);
 		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg == devc->analog_groups[i]) {
-				for (j = 0; j < ARRAY_SIZE(coupling); j++) {
-					if (!strcmp(tmp_str, coupling[j])) {
-						g_free(devc->coupling[i]);
-						devc->coupling[i] = g_strdup(coupling[j]);
-						return rigol_ds_config_set(sdi, ":CHAN%d:COUP %s", i + 1,
-								devc->coupling[i]);
-					}
-				}
-				sr_err("Invalid coupling index: %d.", j);
+			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;
 	case SR_CONF_PROBE_FACTOR:
-		if (!cg) {
-			sr_err("No channel group specified.");
+		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		}
 		p = g_variant_get_uint64(data);
 		for (i = 0; i < devc->model->analog_channels; i++) {
-			if (cg == devc->analog_groups[i]) {
-				for (j = 0; j < ARRAY_SIZE(probe_factor); j++) {
-					if (p == probe_factor[j]) {
-						devc->attenuation[i] = p;
-						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_err("Invalid probe factor: %"PRIu64".", p);
+			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;
@@ -837,8 +762,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	return ret;
 }
 
-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)
 {
 	unsigned int i;
 	struct dev_context *devc;
@@ -879,7 +804,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			return SR_ERR_ARG;
 		if (!cg)
 			return SR_ERR_CHANNEL_GROUP;
-		*data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->vdivs, devc->num_vdivs);
+		*data = std_gvar_tuple_array(devc->vdivs, devc->num_vdivs);
 		break;
 	case SR_CONF_TIMEBASE:
 		if (!devc)
@@ -887,7 +812,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 			return SR_ERR_ARG;
 		if (devc->num_timebases <= 0)
 			return SR_ERR_NA;
-		*data = std_gvar_tuple_array((const uint64_t (*)[][2])devc->timebases, devc->num_timebases);
+		*data = std_gvar_tuple_array(devc->timebases, devc->num_timebases);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		if (!devc)