X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=b87d230df0684cf690e6467aa0e0d026b090e50e;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=0a16ca5f2c5b245d7c51455666abb1ddd9e6654f;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 0a16ca5f..b87d230d 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -182,8 +182,8 @@ static GSList *scan_3203(struct sr_dev_driver *di, GSList *options)
 	return scan(di, options, PPS_3203T_3S);
 }
 
-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;
@@ -234,29 +234,13 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return SR_OK;
 }
 
-static int find_str(const char *str, const char **strings, int array_size)
-{
-	int idx, i;
-
-	idx = -1;
-	for (i = 0; i < array_size; i++) {
-		if (!strcmp(str, strings[i])) {
-			idx = i;
-			break;
-		}
-	}
-
-	return idx;
-}
-
-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;
 	struct sr_channel *ch;
 	gdouble dval;
 	int channel, ret, ival;
-	const char *sval;
 	gboolean bval;
 
 	ret = SR_OK;
@@ -264,12 +248,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	if (!cg) {
 		switch (key) {
 		case SR_CONF_CHANNEL_CONFIG:
-			sval = g_variant_get_string(data, NULL);
-			if ((ival = find_str(sval, channel_modes,
-							ARRAY_SIZE(channel_modes))) == -1) {
-				ret = SR_ERR_ARG;
-				break;
-			}
+			if ((ival = std_str_idx(data, ARRAY_AND_SIZE(channel_modes))) < 0)
+				return SR_ERR_ARG;
 			if (devc->model->channel_modes && (1 << ival) == 0) {
 				/* Not supported on this model. */
 				ret = SR_ERR_ARG;
@@ -327,14 +307,12 @@ 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)
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
-	GVariant *gvar;
-	GVariantBuilder gvb;
-	int channel, i;
+	int channel;
 
 	devc = (sdi) ? sdi->priv : NULL;
 
@@ -349,7 +327,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 				*data = g_variant_new_strv(channel_modes, 1);
 			} else {
 				/* The other models support all modes. */
-				*data = g_variant_new_strv(channel_modes, ARRAY_SIZE(channel_modes));
+				*data = g_variant_new_strv(ARRAY_AND_SIZE(channel_modes));
 			}
 			break;
 		default:
@@ -362,26 +340,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
 			break;
 		case SR_CONF_VOLTAGE_TARGET:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, step. */
-			for (i = 0; i < 3; i++) {
-				gvar = g_variant_new_double(devc->model->channels[channel].voltage[i]);
-				g_variant_builder_add_value(&gvb, gvar);
-			}
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_min_max_step_array(devc->model->channels[channel].voltage);
 			break;
 		case SR_CONF_CURRENT_LIMIT:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, step. */
-			for (i = 0; i < 3; i++) {
-				gvar = g_variant_new_double(devc->model->channels[channel].current[i]);
-				g_variant_builder_add_value(&gvb, gvar);
-			}
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_min_max_step_array(devc->model->channels[channel].current);
 			break;
 		default:
 			return SR_ERR_NA;