X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpce-322a%2Fapi.c;h=04a8cfba407c98ad4f2a8c6757c6cbc88f6f20e9;hb=f8195cb2da3268c89e24071ed32ab9acdded5bc0;hp=3ac85730c65b419fd18a126e4c21fcf4eb415268;hpb=6e43c3d5318a8ff320bf6539a9efe7f0b8497e2f;p=libsigrok.git

diff --git a/src/hardware/pce-322a/api.c b/src/hardware/pce-322a/api.c
index 3ac85730..04a8cfba 100644
--- a/src/hardware/pce-322a/api.c
+++ b/src/hardware/pce-322a/api.c
@@ -43,13 +43,11 @@ static const uint32_t devopts[] = {
 };
 
 static const char *weight_freq[] = {
-	"A",
-	"C",
+	"A", "C",
 };
 
 static const char *weight_time[] = {
-	"F",
-	"S",
+	"F", "S",
 };
 
 static const uint64_t meas_ranges[][2] = {
@@ -60,8 +58,7 @@ static const uint64_t meas_ranges[][2] = {
 };
 
 static const char *data_sources[] = {
-	"Live",
-	"Memory",
+	"Live", "Memory",
 };
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -103,11 +100,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear_with_callback(di, NULL);
-}
-
 static int config_get(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -244,58 +236,27 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	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(ARRAY_AND_SIZE(weight_freq));
+		break;
+	case SR_CONF_SPL_WEIGHT_TIME:
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(weight_time));
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		*data = std_gvar_tuple_array(&meas_ranges, ARRAY_SIZE(meas_ranges));
+		break;
+	case SR_CONF_DATA_SOURCE:
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(data_sources));
+		break;
+	default:
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -331,7 +292,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	std_session_send_df_header(sdi);
 
-	/* Poll every 150ms, or whenever some data comes in. */
 	serial = sdi->conn;
 	serial_source_add(sdi->session, serial, G_IO_IN, 150,
 			pce_322a_receive_data, (void *)sdi);
@@ -347,7 +307,7 @@ static struct sr_dev_driver pce_322a_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,