output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index 349e65e9299f5caa1e0afa3cfaa19aae36903561..068a215ac5f6956a4968e46566d2c3e7ce11b9d7 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -63,6 +63,7 @@ static struct sr_key_info sr_key_info_config[] = {
        {SR_CONF_SCALE, SR_T_STRING, NULL, "Scale", NULL},
        {SR_CONF_SIGNAL_GENERATOR, SR_T_STRING, NULL, "Signal generator", NULL},
        {SR_CONF_POWERMETER, SR_T_STRING, NULL, "Power meter", NULL},
+       {SR_CONF_MULTIPLEXER, SR_T_STRING, NULL, "Multiplexer", NULL},
 
        /* Driver scan options */
        {SR_CONF_CONN, SR_T_STRING, "conn",
@@ -73,6 +74,8 @@ static struct sr_key_info sr_key_info_config[] = {
                "Modbus slave address", NULL},
        {SR_CONF_FORCE_DETECT, SR_T_STRING, "force_detect",
                "Forced detection", NULL},
+       {SR_CONF_PROBE_NAMES, SR_T_STRING, "probe_names",
+               "Names of device's probes", NULL},
 
        /* Device (or channel group) configuration */
        {SR_CONF_SAMPLERATE, SR_T_UINT64, "samplerate",
@@ -211,6 +214,8 @@ static struct sr_key_info sr_key_info_config[] = {
                "Power Target", NULL},
        {SR_CONF_RESISTANCE_TARGET, SR_T_FLOAT, "resistance_target",
                "Resistance Target", NULL},
+       {SR_CONF_OVER_CURRENT_PROTECTION_DELAY, SR_T_FLOAT, "ocp_delay",
+               "Over-current protection delay", NULL},
 
        /* Special stuff */
        {SR_CONF_SESSIONFILE, SR_T_STRING, "sessionfile",
@@ -328,6 +333,8 @@ SR_PRIV const GVariantType *sr_variant_type_get(int datatype)
        switch (datatype) {
        case SR_T_INT32:
                return G_VARIANT_TYPE_INT32;
+       case SR_T_UINT32:
+               return G_VARIANT_TYPE_UINT32;
        case SR_T_UINT64:
                return G_VARIANT_TYPE_UINT64;
        case SR_T_STRING: