X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=640559149254852c85d853590a2e850a7bf45fec;hb=8417ebad122cfade0f9ae6db6cbd8e7249156753;hp=834e4290d24a153dc0442927e3dfa98326e93c3d;hpb=1487ce4fbc0368058d16d42666fd8703e976f072;p=libsigrok.git

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 834e4290..64055914 100644
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -35,6 +35,8 @@ static const int32_t hwcaps[] = {
 	SR_CONF_DATALOG,
 	SR_CONF_SPL_WEIGHT_FREQ,
 	SR_CONF_SPL_WEIGHT_TIME,
+	SR_CONF_HOLD_MAX,
+	SR_CONF_HOLD_MIN,
 };
 
 static const char *weight_freq[] = {
@@ -171,18 +173,20 @@ static int cleanup(void)
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	int tmp;
+	int tmp, ret;
 
 	if (!sdi)
 		return SR_ERR_ARG;
 
 	devc = sdi->priv;
+	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
 		break;
 	case SR_CONF_DATALOG:
-		*data = g_variant_new_boolean(cem_dt_885x_recording_get(sdi));
+		if ((ret = cem_dt_885x_recording_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp);
 		break;
 	case SR_CONF_SPL_WEIGHT_FREQ:
 		tmp = cem_dt_885x_weight_freq_get(sdi);
@@ -202,18 +206,26 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 		else
 			return SR_ERR;
 		break;
+	case SR_CONF_HOLD_MAX:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MAX);
+		break;
+	case SR_CONF_HOLD_MIN:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return SR_OK;
+	return ret;
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	uint64_t tmp_u64;
-	int ret;
+	int tmp, ret;
 	const char *tmp_str;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -232,13 +244,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 		ret = SR_OK;
 		break;
 	case SR_CONF_DATALOG:
-		if (g_variant_get_boolean(data)) {
-			/* Start logging. */
-			ret = cem_dt_885x_recording_set(sdi, TRUE);
-		} else {
-			/* Stop logging. */
-			ret = cem_dt_885x_recording_set(sdi, FALSE);
-		}
+		ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data));
 		break;
 	case SR_CONF_SPL_WEIGHT_FREQ:
 		tmp_str = g_variant_get_string(data, NULL);
@@ -262,6 +268,14 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 		else
 			return SR_ERR_ARG;
 		break;
+	case SR_CONF_HOLD_MAX:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
+	case SR_CONF_HOLD_MIN:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
 	default:
 		ret = SR_ERR_NA;
 	}