X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=c5d4bf29b02ded8aa387f8266ef129ef400fb9ab;hb=6ab604c5c2001b5d47a00ce635c0a2438bed4d06;hp=811c7292d064d36713f9618bae65809eb9701584;hpb=ca7dbb56161f9f4b7f842103fca59d41d559c793;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 811c7292..c5d4bf29 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -165,10 +165,8 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Output frequency", NULL},
 	{SR_CONF_OUTPUT_FREQUENCY_TARGET, SR_T_FLOAT, "output_frequency_target",
 		"Output frequency target", NULL},
-	{SR_CONF_MEASURED_QUANTITY, SR_T_STRING, "measured_quantity",
+	{SR_CONF_MEASURED_QUANTITY, SR_T_MQ, "measured_quantity",
 		"Measured quantity", NULL},
-	{SR_CONF_MEASURED_2ND_QUANTITY, SR_T_STRING, "measured_2nd_quantity",
-		"Measured secondary quantity", NULL},
 	{SR_CONF_EQUIV_CIRCUIT_MODEL, SR_T_STRING, "equiv_circuit_model",
 		"Equivalent circuit model", NULL},
 	{SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE, SR_T_BOOL, "otp_active",
@@ -302,8 +300,8 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
 		return G_VARIANT_TYPE_TUPLE;
 	case SR_T_KEYVALUE:
 		return G_VARIANT_TYPE_DICTIONARY;
-	case SR_T_MQLIST:
-		return G_VARIANT_TYPE_ARRAY;
+	case SR_T_MQ:
+		return G_VARIANT_TYPE_TUPLE;
 	default:
 		return NULL;
 	}
@@ -602,7 +600,7 @@ static int check_key(const struct sr_dev_driver *driver,
 
 	if (sr_config_list(driver, sdi, cg, SR_CONF_DEVICE_OPTIONS, &gvar_opts) != SR_OK) {
 		/* Driver publishes no options. */
-		sr_err("No options available%s.", srci->id, suffix);
+		sr_err("No options available%s.", suffix);
 		return SR_ERR_ARG;
 	}
 	opts = g_variant_get_fixed_array(gvar_opts, &num_opts, sizeof(uint32_t));