X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=a676d026a6aadcc60d904f31494746090d14fef5;hb=e7136c626f433bcdc101eaa24191ce5682803540;hp=595ea65742f3622062c160947f458662411a954f;hpb=75772c721d45d3b33618388e41d2d874c4f88302;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index 595ea657..a676d026 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -17,13 +17,13 @@ * along with this program. If not, see . */ +#include #include #include #include #include #include #include -#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */ #include #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", @@ -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"; @@ -602,7 +601,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));