X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fapi.c;h=55e342d81d01063c4f5e93b104229d491fed4097;hp=4d95ddda3f13776ee30973445ed6e3e95d8fc521;hb=e66d1892d0dd16ed166fc8f13493f95de0607362;hpb=13d2ac54f4232caf768268817c8cbb2f64dcb0db

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 4d95ddda..55e342d8 100644
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -358,27 +358,11 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	GVariant *gvar;
 	GVariantBuilder gvb;
 
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (!sdi)
-		return SR_ERR_ARG;
-
 	if (!cg) {
 		switch (key) {
+		case SR_CONF_SCAN_OPTIONS:
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
+			return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 		case SR_CONF_SAMPLERATE:
 			g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
 			gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,