Add new sr_dev_options() helper function.

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 0700276cb84db77f39ebdd0ee6e88ca5be9d89c7..a676d026a6aadcc60d904f31494746090d14fef5 100644 (file)
--- 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"
 
@@ -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";