Introduce standard implementation of the dev_list() callback

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 5a4b1b01b77ce2aec84cadfdd1a69f76a6112b74..1a502ca8cc37146b7409bf1f22d07ad4ba69eac6 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -171,12 +171,12 @@ 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_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",
@@ -189,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",
@@ -276,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
 };
 
@@ -395,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
@@ -408,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;
@@ -584,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)
@@ -592,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,