X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhwdriver.c;h=fafd93fc45e9ece33271722a400ddfa6f0b60ecd;hb=709468baf7626b162b5559c101516289d9bbb258;hp=0aa7eb8c0f0517bf44dee0c30c964bdc679fcfe9;hpb=cffdc3e63b132795bfcaab91864c1c6b124e87fa;p=libsigrok.git diff --git a/src/hwdriver.c b/src/hwdriver.c index 0aa7eb8c..fafd93fc 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -171,6 +171,10 @@ static struct sr_key_info sr_key_info_config[] = { "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_SESSIONFILE, SR_T_STRING, "sessionfile", @@ -185,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", @@ -193,7 +199,7 @@ static struct sr_key_info sr_key_info_config[] = { "Sample limit", NULL}, {SR_CONF_LIMIT_FRAMES, SR_T_UINT64, "limit_frames", "Frame limit", NULL}, - {SR_CONF_CONTINUOUS, SR_T_UINT64, "continuous", + {SR_CONF_CONTINUOUS, SR_T_BOOL, "continuous", "Continuous sampling", NULL}, {SR_CONF_DATALOG, SR_T_BOOL, "datalog", "Datalog", NULL}, @@ -272,6 +278,7 @@ static struct sr_key_info sr_key_info_mqflag[] = { {SR_MQFLAG_AVG, 0, "average", "Average", NULL}, {SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL}, {SR_MQFLAG_UNSTABLE, 0, "unstable", "Unstable", NULL}, + {SR_MQFLAG_FOUR_WIRE, 0, "four_wire", "4-Wire", NULL}, ALL_ZERO }; @@ -391,7 +398,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver) /** * Enumerate scan options supported by this driver. * - * Before calling sr_driver_scan_options(), the user must have previously + * 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 @@ -404,7 +411,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver) * * @since 0.4.0 */ -SR_API GArray *sr_driver_scan_options(const struct sr_dev_driver *driver) +SR_API GArray *sr_driver_scan_options_list(const struct sr_dev_driver *driver) { GVariant *gvar; const uint32_t *opts; @@ -580,6 +587,7 @@ static void log_key(const struct sr_dev_inst *sdi, { const char *opstr; const struct sr_key_info *srci; + gchar *tmp_str; /* Don't log SR_CONF_DEVICE_OPTIONS, it's verbose and not too useful. */ if (key == SR_CONF_DEVICE_OPTIONS) @@ -588,9 +596,11 @@ static void log_key(const struct sr_dev_inst *sdi, opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list"; srci = sr_key_info_get(SR_KEY_CONFIG, key); + tmp_str = g_variant_print(data, TRUE); sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s -> %s", opstr, key, srci ? srci->id : "NULL", sdi, cg ? cg->name : "NULL", - data ? g_variant_print(data, TRUE) : "NULL"); + data ? tmp_str : "NULL"); + g_free(tmp_str); } static int check_key(const struct sr_dev_driver *driver, @@ -662,10 +672,11 @@ static int check_key(const struct sr_dev_driver *driver, /** * Query value of a configuration key at the given driver or device instance. * - * @param[in] driver The sr_dev_driver struct to query. + * @param[in] driver The sr_dev_driver struct to query. Must not be NULL. * @param[in] sdi (optional) If the key is specific to a device, this must * contain a pointer to the struct sr_dev_inst to be checked. - * Otherwise it must be NULL. + * Otherwise it must be NULL. If sdi is != NULL, sdi->priv must + * also be != NULL. * @param[in] cg The channel group on the device for which to list the * values, or NULL. * @param[in] key The configuration key (SR_CONF_*). @@ -699,6 +710,9 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, if (check_key(driver, sdi, cg, key, SR_CONF_GET, NULL) != SR_OK) return SR_ERR_ARG; + if (sdi && !sdi->priv) + return SR_ERR; + if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) { log_key(sdi, cg, key, SR_CONF_GET, *data); /* Got a floating reference from the driver. Sink it here, @@ -712,7 +726,8 @@ SR_API int sr_config_get(const struct sr_dev_driver *driver, /** * Set value of a configuration key in a device instance. * - * @param[in] sdi The device instance. + * @param[in] sdi The device instance. Must not be NULL. sdi->driver and + * sdi->priv must not be NULL either. * @param[in] cg The channel group on the device for which to list the * values, or NULL. * @param[in] key The configuration key (SR_CONF_*). @@ -736,7 +751,7 @@ SR_API int sr_config_set(const struct sr_dev_inst *sdi, g_variant_ref_sink(data); - if (!sdi || !sdi->driver || !data) + if (!sdi || !sdi->driver || !sdi->priv || !data) ret = SR_ERR; else if (!sdi->driver->config_set) ret = SR_ERR_ARG;