X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhp-3478a%2Fapi.c;h=1979c52928d78dfcae41c989668e1e5571f328fa;hb=d241cc20bd476712806a36ee2838670434ce1d32;hp=1fd3ff203ad7a872fa451a7361fc1485d277a019;hpb=8ef4fb3347830023b80a5e121c7ffd66e10f4944;p=libsigrok.git

diff --git a/src/hardware/hp-3478a/api.c b/src/hardware/hp-3478a/api.c
index 1fd3ff20..1979c529 100644
--- a/src/hardware/hp-3478a/api.c
+++ b/src/hardware/hp-3478a/api.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2017-2021 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -192,7 +192,9 @@ static int config_get(uint32_t key, GVariant **data,
 
 	(void)cg;
 
-	devc = sdi ? sdi->priv : NULL;
+	if (!sdi)
+		return SR_ERR_ARG;
+	devc = sdi->priv;
 
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
@@ -203,7 +205,7 @@ static int config_get(uint32_t key, GVariant **data,
 		if (ret != SR_OK)
 			return ret;
 		arr[0] = g_variant_new_uint32(devc->measurement_mq);
-		arr[1] = g_variant_new_uint64(devc->measurement_mq_flags);
+		arr[1] = g_variant_new_uint64(devc->measurement_mq_flag);
 		*data = g_variant_new_tuple(arr, 2);
 		break;
 	case SR_CONF_RANGE:
@@ -213,7 +215,7 @@ static int config_get(uint32_t key, GVariant **data,
 		range_str = "Auto";
 		for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
 			if (rangeopts[i].mq == devc->measurement_mq &&
-					rangeopts[i].mqflag == devc->measurement_mq_flags &&
+					rangeopts[i].mqflag == devc->measurement_mq_flag &&
 					rangeopts[i].range_exp == devc->range_exp) {
 				range_str = rangeopts[i].range_str;
 				break;
@@ -247,7 +249,9 @@ static int config_set(uint32_t key, GVariant *data,
 
 	(void)cg;
 
-	devc = sdi ? sdi->priv : NULL;
+	if (!sdi)
+		return SR_ERR_ARG;
+	devc = sdi->priv;
 
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
@@ -265,7 +269,7 @@ static int config_set(uint32_t key, GVariant *data,
 		range_str = g_variant_get_string(data, NULL);
 		for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
 			if (rangeopts[i].mq == devc->measurement_mq &&
-					rangeopts[i].mqflag == devc->measurement_mq_flags &&
+					rangeopts[i].mqflag == devc->measurement_mq_flag &&
 					g_strcmp0(rangeopts[i].range_str, range_str) == 0) {
 				return hp_3478a_set_range(sdi, rangeopts[i].range_exp);
 			}
@@ -294,7 +298,11 @@ static int config_list(uint32_t key, GVariant **data,
 	GVariant *gvar, *arr[2];
 	GVariantBuilder gvb;
 
-	devc = sdi ? sdi->priv : NULL;
+	/* Only handle standard keys when no device instance is given. */
+	if (!sdi)
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+
+	devc = sdi->priv;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
@@ -321,7 +329,7 @@ static int config_list(uint32_t key, GVariant **data,
 		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
 		for (i = 0; i < ARRAY_SIZE(rangeopts); i++) {
 			if (rangeopts[i].mq == devc->measurement_mq &&
-					rangeopts[i].mqflag == devc->measurement_mq_flags) {
+					rangeopts[i].mqflag == devc->measurement_mq_flag) {
 				g_variant_builder_add(&gvb, "s", rangeopts[i].range_str);
 			}
 		}