X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=678f67b8a92cce2f8814cdc0e6cc7b1277b49372;hb=a5e44c3247ae64ab1a65e7c6ebe6d66c6ab0a0a1;hp=d50d5be4e2318030eccb1e0197a191c9b8349e5a;hpb=cd2f0fe22c35dcf3b010411ff6f123701be2a2d6;p=libsigrok.git

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index d50d5be4..678f67b8 100644
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -19,18 +19,16 @@
 
 #include "protocol.h"
 
-static const int hwopts[] = {
+static const int32_t hwopts[] = {
 	SR_CONF_CONN,
 	SR_CONF_SERIALCOMM,
-	0,
 };
 
-static const int hwcaps[] = {
+static const int32_t hwcaps[] = {
 	SR_CONF_MULTIMETER,
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_MSEC,
-	0,
 };
 
 SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
@@ -148,10 +146,10 @@ static GSList *hw_scan(GSList *options)
 		src = l->data;
 		switch (src->key) {
 		case SR_CONF_CONN:
-			conn = src->value;
+			conn = g_variant_get_string(src->data, NULL);
 			break;
 		case SR_CONF_SERIALCOMM:
-			serialcomm = src->value;
+			serialcomm = g_variant_get_string(src->data, NULL);
 			break;
 		}
 	}
@@ -213,35 +211,13 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int config_list(int key, const void **data,
-		       const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	switch (key) {
-	case SR_CONF_SCAN_OPTIONS:
-		*data = hwopts;
-		break;
-	case SR_CONF_DEVICE_OPTIONS:
-		*data = hwcaps;
-		break;
-	default:
-		sr_err("Unknown config key: %d.", key);
-		return SR_ERR_ARG;
-	}
-
-	return SR_OK;
-}
-
-static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
+static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	int ret;
 
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device inactive, can't set config options.");
-		return SR_ERR;
-	}
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
 
 	if (!(devc = sdi->priv)) {
 		sr_err("sdi->priv was NULL.");
@@ -251,24 +227,46 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 	ret = SR_OK;
 	switch (id) {
 	case SR_CONF_LIMIT_SAMPLES:
-		devc->limit_samples = *(const uint64_t *)value;
+		devc->limit_samples = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_LIMIT_MSEC:
-		devc->limit_msec = *(const uint64_t *)value;
+		devc->limit_msec = g_variant_get_uint64(data);
 		break;
 	default:
-		sr_err("Unknown hardware capability: %d.", id);
-		ret = SR_ERR_ARG;
+		ret = SR_ERR_NA;
 	}
 
 	return ret;
 }
 
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+{
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+		break;
+	default:
+		return SR_ERR_NA;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
 	struct dev_context *devc;
 
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
+
 	if (!(devc = sdi->priv)) {
 		sr_err("sdi->priv was NULL.");
 		return SR_ERR_BUG;