X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=c5d4bf29b02ded8aa387f8266ef129ef400fb9ab;hb=5dd538ded0d5873541af7cdf2e54c3e6d8297b49;hp=99f3ee3fba0dc165af93cae435469aa4b382dcc9;hpb=29ae6f0880eb8dab93507382b5b35d36df8ef1e0;p=libsigrok.git
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 99f3ee3f..c5d4bf29 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"
@@ -45,7 +45,7 @@
* @{
*/
-/* Same key order/grouping as in enum sr_configkey (libsigrok.h). */
+/* Please use the same order/grouping as in enum sr_configkey (libsigrok.h). */
static struct sr_key_info sr_key_info_config[] = {
/* Device classes */
{SR_CONF_LOGIC_ANALYZER, SR_T_STRING, NULL, "Logic analyzer", NULL},
@@ -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",
@@ -211,6 +209,7 @@ static struct sr_key_info sr_key_info_config[] = {
{0, 0, NULL, NULL, NULL},
};
+/* Please use the same order as in enum sr_mq (libsigrok.h). */
static struct sr_key_info sr_key_info_mq[] = {
{SR_MQ_VOLTAGE, 0, "voltage", "Voltage", NULL},
{SR_MQ_CURRENT, 0, "current", "Current", NULL},
@@ -247,6 +246,7 @@ static struct sr_key_info sr_key_info_mq[] = {
ALL_ZERO
};
+/* Please use the same order as in enum sr_mqflag (libsigrok.h). */
static struct sr_key_info sr_key_info_mqflag[] = {
{SR_MQFLAG_AC, 0, "ac", "AC", NULL},
{SR_MQFLAG_DC, 0, "dc", "DC", NULL},
@@ -279,6 +279,7 @@ static struct sr_key_info sr_key_info_mqflag[] = {
ALL_ZERO
};
+/* This must handle all the keys from enum sr_datatype (libsigrok.h). */
SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
{
switch (datatype) {
@@ -299,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;
}
@@ -599,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));