X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=a676d026a6aadcc60d904f31494746090d14fef5;hb=9e9dba7b41bdd87d4ce442bc9bf6507518e97000;hp=fa730a971ba40de1501d99362b6c0aa32d606f4c;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hwdriver.c b/src/hwdriver.c
index fa730a97..a676d026 100644
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -167,8 +167,6 @@ static struct sr_key_info sr_key_info_config[] = {
 		"Output frequency target", NULL},
 	{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",
@@ -208,7 +206,7 @@ static struct sr_key_info sr_key_info_config[] = {
 	{SR_CONF_TEST_MODE, SR_T_STRING, "test_mode",
 		"Test mode", NULL},
 
-	{0, 0, NULL, NULL, NULL},
+	ALL_ZERO
 };
 
 /* Please use the same order as in enum sr_mq (libsigrok.h). */
@@ -571,7 +569,8 @@ static int check_key(const struct sr_dev_driver *driver,
 	GVariant *gvar_opts;
 	const uint32_t *opts;
 	uint32_t pub_opt;
-	char *suffix, *opstr;
+	const char *suffix;
+	const char *opstr;
 
 	if (sdi && cg)
 		suffix = " for this device and channel group";