X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpce-322a%2Fapi.c;h=1ac30aed0cf5a771571fb9f0da76dca064bc05f8;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hp=14534e2ad9991f4af384483c295018bb30a55d8b;hpb=13d2ac54f4232caf768268817c8cbb2f64dcb0db;p=libsigrok.git

diff --git a/src/hardware/pce-322a/api.c b/src/hardware/pce-322a/api.c
index 14534e2a..1ac30aed 100644
--- a/src/hardware/pce-322a/api.c
+++ b/src/hardware/pce-322a/api.c
@@ -242,55 +242,35 @@ static int config_list(uint32_t key, GVariant **data,
 	GVariant *tuple, *range[2];
 	GVariantBuilder gvb;
 	unsigned int i;
-	int ret;
-
-	(void)cg;
 
-	ret = SR_OK;
-	if (!sdi) {
-		switch (key) {
-		case SR_CONF_SCAN_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-			break;
-		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-			break;
-		default:
-			return SR_ERR_NA;
-		}
-	} else {
-		switch (key) {
-		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
-		case SR_CONF_SPL_WEIGHT_FREQ:
-			*data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
-			break;
-		case SR_CONF_SPL_WEIGHT_TIME:
-			*data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
-			break;
-		case SR_CONF_SPL_MEASUREMENT_RANGE:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
-				range[0] = g_variant_new_uint64(meas_ranges[i][0]);
-				range[1] = g_variant_new_uint64(meas_ranges[i][1]);
-				tuple = g_variant_new_tuple(range, 2);
-				g_variant_builder_add_value(&gvb, tuple);
-			}
-			*data = g_variant_builder_end(&gvb);
-			break;
-		case SR_CONF_DATA_SOURCE:
-			*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
-			break;
-		default:
-			return SR_ERR_NA;
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+	case SR_CONF_DEVICE_OPTIONS:
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+	case SR_CONF_SPL_WEIGHT_FREQ:
+		*data = g_variant_new_strv(weight_freq, ARRAY_SIZE(weight_freq));
+		break;
+	case SR_CONF_SPL_WEIGHT_TIME:
+		*data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+		for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+			range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+			range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+			tuple = g_variant_new_tuple(range, 2);
+			g_variant_builder_add_value(&gvb, tuple);
 		}
+		*data = g_variant_builder_end(&gvb);
+		break;
+	case SR_CONF_DATA_SOURCE:
+		*data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources));
+		break;
+	default:
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)