X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhwdriver.c;h=b31242ad7799dec7aef83d974bce5372b16f7e2b;hb=10e0d374cb9518d2d5e6d876bd72888478fd1900;hp=99f3ee3fba0dc165af93cae435469aa4b382dcc9;hpb=29ae6f0880eb8dab93507382b5b35d36df8ef1e0;p=libsigrok.git
diff --git a/src/hwdriver.c b/src/hwdriver.c
index 99f3ee3f..b31242ad 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,20 +165,18 @@ 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",
"Over-temperature protection active", NULL},
+ {SR_CONF_UNDER_VOLTAGE_CONDITION, SR_T_BOOL, "uvc",
+ "Under-voltage condition", NULL},
+ {SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE, SR_T_BOOL, "uvc_active",
+ "Under-voltage condition active", NULL},
/* Special stuff */
- {SR_CONF_SCAN_OPTIONS, SR_T_STRING, "scan_options",
- "Scan options", NULL},
- {SR_CONF_DEVICE_OPTIONS, SR_T_STRING, "device_options",
- "Device options", NULL},
{SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
"Session file", NULL},
{SR_CONF_CAPTUREFILE, SR_T_STRING, "capturefile",
@@ -191,6 +189,8 @@ static struct sr_key_info sr_key_info_config[] = {
"Data source", NULL},
{SR_CONF_PROBE_FACTOR, SR_T_UINT64, "probe_factor",
"Probe factor", NULL},
+ {SR_CONF_ADC_POWERLINE_CYCLES, SR_T_FLOAT, "nplc",
+ "Number of ADC powerline cycles", NULL},
/* Acquisition modes, sample limiting */
{SR_CONF_LIMIT_MSEC, SR_T_UINT64, "limit_time",
@@ -208,9 +208,10 @@ 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). */
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 +248,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 +281,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 +302,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;
}
@@ -391,6 +394,43 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
return ret;
}
+/**
+ * Enumerate scan options supported by this driver.
+ *
+ * Before calling sr_driver_scan_options_list(), the user must have previously
+ * initialized the driver by calling sr_driver_init().
+ *
+ * @param driver The driver to enumerate options for. This must be a pointer
+ * to one of the entries returned by sr_driver_list(). Must not
+ * be NULL.
+ *
+ * @return A GArray * of uint32_t entries, or NULL on invalid arguments. Each
+ * entry is a configuration key that is supported as a scan option.
+ * The array must be freed by the caller using g_array_free().
+ *
+ * @since 0.4.0
+ */
+SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver)
+{
+ GVariant *gvar;
+ const uint32_t *opts;
+ gsize num_opts;
+ GArray *result;
+
+ if (sr_config_list(driver, NULL, NULL, SR_CONF_SCAN_OPTIONS, &gvar) != SR_OK)
+ return NULL;
+
+ opts = g_variant_get_fixed_array(gvar, &num_opts, sizeof(uint32_t));
+
+ result = g_array_sized_new(FALSE, FALSE, sizeof(uint32_t), num_opts);
+
+ g_array_insert_vals(result, 0, opts, num_opts);
+
+ g_variant_unref(gvar);
+
+ return result;
+}
+
static int check_options(struct sr_dev_driver *driver, GSList *options,
uint32_t optlist_key, struct sr_dev_inst *sdi,
struct sr_channel_group *cg)
@@ -568,7 +608,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";
@@ -599,7 +640,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));