X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcem-dt-885x%2Fapi.c;h=252946e330fcf3b075673f5c80c8819feee94008;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=943377a3df67e67ee2f182eaafacba15c0e36e5e;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 943377a3..252946e3 100644
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -24,22 +24,25 @@
 /* 23ms is the longest interval between tokens. */
 #define MAX_SCAN_TIME 25 * 1000
 
-static const uint32_t hwopts[] = {
+static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
-static const uint32_t hwcaps[] = {
+static const uint32_t devopts[] = {
 	SR_CONF_SOUNDLEVELMETER,
-	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_SPL_WEIGHT_FREQ,
-	SR_CONF_SPL_WEIGHT_TIME,
-	SR_CONF_SPL_MEASUREMENT_RANGE,
-	SR_CONF_DATALOG,
-	SR_CONF_HOLD_MAX,
-	SR_CONF_HOLD_MIN,
-	SR_CONF_POWER_OFF,
-	SR_CONF_DATA_SOURCE,
+	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const uint32_t devopts_global[] = {
+	SR_CONF_SPL_WEIGHT_FREQ | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SPL_WEIGHT_TIME | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_SPL_MEASUREMENT_RANGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_DATALOG | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_HOLD_MAX | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_HOLD_MIN | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 static const char *weight_freq[] = {
@@ -97,18 +100,19 @@ static GSList *scan(GSList *options)
 	if (!(serial = sr_serial_dev_inst_new(conn, SERIALCOMM)))
 		return NULL;
 
-	if (serial_open(serial, SERIAL_RDONLY | SERIAL_NONBLOCK) != SR_OK)
+	if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
 		return NULL;
 
 	devices = NULL;
 	drvc = di->priv;
 	start = g_get_monotonic_time();
 	while (g_get_monotonic_time() - start < MAX_SCAN_TIME) {
-		if (serial_read(serial, &c, 1) == 1 && c == 0xa5) {
+		if (serial_read_nonblocking(serial, &c, 1) == 1 && c == 0xa5) {
 			/* Found one. */
-			if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "CEM",
-					"DT-885x", NULL)))
-				return NULL;
+			sdi = sr_dev_inst_new();
+			sdi->status = SR_ST_INACTIVE;
+			sdi->vendor = g_strdup("CEM");
+			sdi->model = g_strdup("DT-885x");
 
 			if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
 				sr_dbg("Device context malloc failed.");
@@ -335,40 +339,49 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	unsigned int i;
 	int ret;
 
-	(void)sdi;
 	(void)cg;
 
 	ret = SR_OK;
-	switch (key) {
-	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t));
-		break;
-	case SR_CONF_DEVICE_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				hwcaps, ARRAY_SIZE(hwcaps), 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);
+	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,
+					devopts, ARRAY_SIZE(devopts), 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_global, ARRAY_SIZE(devopts_global), sizeof(uint32_t));
+		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;
 		}
-		*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;