#include <string.h>
#include <glib.h>
#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
/** @cond PRIVATE */
*/
/* Same key order/grouping as in enum sr_configkey (libsigrok.h). */
-static struct sr_config_info sr_config_info_data[] = {
+static struct sr_key_info sr_key_info_config[] = {
/* Device classes */
{SR_CONF_LOGIC_ANALYZER, SR_T_STRING, NULL, "Logic analyzer", NULL},
{SR_CONF_OSCILLOSCOPE, SR_T_STRING, NULL, "Oscilloscope", NULL},
"Connection", NULL},
{SR_CONF_SERIALCOMM, SR_T_STRING, "serialcomm",
"Serial communication", NULL},
+ {SR_CONF_MODBUSADDR, SR_T_UINT64, "modbusaddr",
+ "Modbus slave address", NULL},
/* Device (or channel group) configuration */
{SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
"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},
/* Special stuff */
{SR_CONF_SCAN_OPTIONS, SR_T_STRING, "scan_options",
{0, 0, NULL, NULL, NULL},
};
+static struct sr_key_info sr_key_info_mq[] = {
+ {SR_MQ_VOLTAGE, 0, "voltage", "Voltage", NULL},
+ {SR_MQ_CURRENT, 0, "current", "Current", NULL},
+ {SR_MQ_RESISTANCE, 0, "resistance", "Resistance", NULL},
+ {SR_MQ_CAPACITANCE, 0, "capacitance", "Capacitance", NULL},
+ {SR_MQ_TEMPERATURE, 0, "temperature", "Temperature", NULL},
+ {SR_MQ_FREQUENCY, 0, "frequency", "Frequency", NULL},
+ {SR_MQ_DUTY_CYCLE, 0, "duty_cycle", "Duty cycle", NULL},
+ {SR_MQ_CONTINUITY, 0, "continuity", "Continuity", NULL},
+ {SR_MQ_PULSE_WIDTH, 0, "pulse_width", "Pulse width", NULL},
+ {SR_MQ_CONDUCTANCE, 0, "conductance", "Conductance", NULL},
+ {SR_MQ_POWER, 0, "power", "Power", NULL},
+ {SR_MQ_GAIN, 0, "gain", "Gain", NULL},
+ {SR_MQ_SOUND_PRESSURE_LEVEL, 0, "spl", "Sound pressure level", NULL},
+ {SR_MQ_CARBON_MONOXIDE, 0, "co", "Carbon monoxide", NULL},
+ {SR_MQ_RELATIVE_HUMIDITY, 0, "rh", "Relative humidity", NULL},
+ {SR_MQ_TIME, 0, "time", "Time", NULL},
+ {SR_MQ_WIND_SPEED, 0, "wind_speed", "Wind speed", NULL},
+ {SR_MQ_PRESSURE, 0, "pressure", "Pressure", NULL},
+ {SR_MQ_PARALLEL_INDUCTANCE, 0, "parallel_inductance", "Parallel inductance", NULL},
+ {SR_MQ_PARALLEL_CAPACITANCE, 0, "parallel_capacitance", "Parallel capacitance", NULL},
+ {SR_MQ_PARALLEL_RESISTANCE, 0, "parallel_resistance", "Parallel resistance", NULL},
+ {SR_MQ_SERIES_INDUCTANCE, 0, "series_inductance", "Series inductance", NULL},
+ {SR_MQ_SERIES_CAPACITANCE, 0, "series_capacitance", "Series capacitance", NULL},
+ {SR_MQ_SERIES_RESISTANCE, 0, "series_resistance", "Series resistance", NULL},
+ {SR_MQ_DISSIPATION_FACTOR, 0, "dissipation_factor", "Dissipation factor", NULL},
+ {SR_MQ_QUALITY_FACTOR, 0, "quality_factor", "Quality factor", NULL},
+ {SR_MQ_PHASE_ANGLE, 0, "phase_angle", "Phase angle", NULL},
+ {SR_MQ_DIFFERENCE, 0, "difference", "Difference", NULL},
+ {SR_MQ_COUNT, 0, "count", "Count", NULL},
+ {SR_MQ_POWER_FACTOR, 0, "power_factor", "Power factor", NULL},
+ {SR_MQ_APPARENT_POWER, 0, "apparent_power", "Apparent power", NULL},
+ ALL_ZERO
+};
+
+static struct sr_key_info sr_key_info_mqflag[] = {
+ {SR_MQFLAG_AC, 0, "ac", "AC", NULL},
+ {SR_MQFLAG_DC, 0, "dc", "DC", NULL},
+ {SR_MQFLAG_RMS, 0, "rms", "RMS", NULL},
+ {SR_MQFLAG_DIODE, 0, "diode", "Diode", NULL},
+ {SR_MQFLAG_HOLD, 0, "hold", "Hold", NULL},
+ {SR_MQFLAG_MAX, 0, "max", "Max", NULL},
+ {SR_MQFLAG_MIN, 0, "min", "Min", NULL},
+ {SR_MQFLAG_AUTORANGE, 0, "auto_range", "Auto range", NULL},
+ {SR_MQFLAG_RELATIVE, 0, "relative", "Relative", NULL},
+ {SR_MQFLAG_SPL_FREQ_WEIGHT_A, 0, "spl_freq_weight_a",
+ "Frequency weighted (A)", NULL},
+ {SR_MQFLAG_SPL_FREQ_WEIGHT_C, 0, "spl_freq_weight_c",
+ "Frequency weighted (C)", NULL},
+ {SR_MQFLAG_SPL_FREQ_WEIGHT_Z, 0, "spl_freq_weight_z",
+ "Frequency weighted (Z)", NULL},
+ {SR_MQFLAG_SPL_FREQ_WEIGHT_FLAT, 0, "spl_freq_weight_flat",
+ "Frequency weighted (flat)", NULL},
+ {SR_MQFLAG_SPL_TIME_WEIGHT_S, 0, "spl_time_weight_s",
+ "Time weighted (S)", NULL},
+ {SR_MQFLAG_SPL_TIME_WEIGHT_F, 0, "spl_time_weight_f",
+ "Time weighted (F)", NULL},
+ {SR_MQFLAG_SPL_LAT, 0, "spl_time_average", "Time-averaged (LEQ)", NULL},
+ {SR_MQFLAG_SPL_PCT_OVER_ALARM, 0, "spl_pct_over_alarm",
+ "Percentage over alarm", NULL},
+ {SR_MQFLAG_DURATION, 0, "duration", "Duration", NULL},
+ {SR_MQFLAG_AVG, 0, "average", "Average", NULL},
+ {SR_MQFLAG_REFERENCE, 0, "reference", "Reference", NULL},
+ ALL_ZERO
+};
+
SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
{
switch (datatype) {
return G_VARIANT_TYPE_TUPLE;
case SR_T_KEYVALUE:
return G_VARIANT_TYPE_DICTIONARY;
+ case SR_T_MQLIST:
+ return G_VARIANT_TYPE_ARRAY;
default:
return NULL;
}
SR_PRIV int sr_variant_type_check(uint32_t key, GVariant *value)
{
- const struct sr_config_info *info;
+ const struct sr_key_info *info;
const GVariantType *type, *expected;
char *expected_string, *type_string;
- info = sr_config_info_get(key);
+ info = sr_key_info_get(SR_KEY_CONFIG, key);
if (!info)
return SR_OK;
struct sr_channel_group *cg)
{
struct sr_config *src;
- const struct sr_config_info *srci;
+ const struct sr_key_info *srci;
GVariant *gvar_opts;
GSList *l;
const uint32_t *opts;
break;
}
if (i == num_opts) {
- if (!(srci = sr_config_info_get(src->key)))
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, src->key)))
/* Shouldn't happen. */
sr_err("Invalid option %d.", src->key);
else
return NULL;
}
- if (!driver->priv) {
+ if (!driver->context) {
sr_err("Driver not initialized, can't scan for devices.");
return NULL;
}
for (i = 0; drivers[i]; i++) {
if (drivers[i]->cleanup)
drivers[i]->cleanup(drivers[i]);
- drivers[i]->priv = NULL;
+ drivers[i]->context = NULL;
}
}
const struct sr_channel_group *cg, uint32_t key, int op, GVariant *data)
{
const char *opstr;
- const struct sr_config_info *srci;
+ const struct sr_key_info *srci;
/* Don't log SR_CONF_DEVICE_OPTIONS, it's verbose and not too useful. */
if (key == SR_CONF_DEVICE_OPTIONS)
return;
opstr = op == SR_CONF_GET ? "get" : op == SR_CONF_SET ? "set" : "list";
- srci = sr_config_info_get(key);
+ srci = sr_key_info_get(SR_KEY_CONFIG, key);
sr_spew("sr_config_%s(): key %d (%s) sdi %p cg %s -> %s", opstr, key,
srci ? srci->id : "NULL", sdi, cg ? cg->name : "NULL",
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg,
uint32_t key, int op, GVariant *data)
{
- const struct sr_config_info *srci;
+ const struct sr_key_info *srci;
gsize num_opts, i;
GVariant *gvar_opts;
const uint32_t *opts;
else
suffix = "";
- if (!(srci = sr_config_info_get(key))) {
+ if (!(srci = sr_key_info_get(SR_KEY_CONFIG, key))) {
sr_err("Invalid key %d.", key);
return SR_ERR_ARG;
}
return ret;
}
+static struct sr_key_info *get_keytable(int keytype)
+{
+ struct sr_key_info *table;
+
+ switch (keytype) {
+ case SR_KEY_CONFIG:
+ table = sr_key_info_config;
+ break;
+ case SR_KEY_MQ:
+ table = sr_key_info_mq;
+ break;
+ case SR_KEY_MQFLAGS:
+ table = sr_key_info_mqflag;
+ break;
+ default:
+ sr_err("Invalid keytype %d", keytype);
+ return NULL;
+ }
+
+ return table;
+}
+
/**
- * Get information about a configuration key, by key.
+ * Get information about a key, by key.
*
- * @param[in] key The configuration key.
+ * @param[in] keytype The namespace the key is in.
+ * @param[in] key The key to find.
*
- * @return A pointer to a struct sr_config_info, or NULL if the key
+ * @return A pointer to a struct sr_key_info, or NULL if the key
* was not found.
*
- * @since 0.2.0
+ * @since 0.3.0
*/
-SR_API const struct sr_config_info *sr_config_info_get(uint32_t key)
+SR_API const struct sr_key_info *sr_key_info_get(int keytype, uint32_t key)
{
+ struct sr_key_info *table;
int i;
- for (i = 0; sr_config_info_data[i].key; i++) {
- if (sr_config_info_data[i].key == key)
- return &sr_config_info_data[i];
+ if (!(table = get_keytable(keytype)))
+ return NULL;
+
+ for (i = 0; table[i].key; i++) {
+ if (table[i].key == key)
+ return &table[i];
}
return NULL;
}
/**
- * Get information about a configuration key, by name.
+ * Get information about a key, by name.
*
- * @param[in] optname The configuration key.
+ * @param[in] keytype The namespace the key is in.
+ * @param[in] keyid The key id string.
*
- * @return A pointer to a struct sr_config_info, or NULL if the key
+ * @return A pointer to a struct sr_key_info, or NULL if the key
* was not found.
*
* @since 0.2.0
*/
-SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname)
+SR_API const struct sr_key_info *sr_key_info_name_get(int keytype, const char *keyid)
{
+ struct sr_key_info *table;
int i;
- for (i = 0; sr_config_info_data[i].key; i++) {
- if (!sr_config_info_data[i].id)
+ if (!(table = get_keytable(keytype)))
+ return NULL;
+
+ for (i = 0; table[i].key; i++) {
+ if (!table[i].id)
continue;
- if (!strcmp(sr_config_info_data[i].id, optname))
- return &sr_config_info_data[i];
+ if (!strcmp(table[i].id, keyid))
+ return &table[i];
}
return NULL;
projects / libsigrok.git / blobdiff