config_set(): Don't check for sdi->priv != NULL.

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index db3f615afecec7d1dbe470fd10ce0282f402c0e4..7e16b82a9cecd2aaca78ead54f4456bea77c56bc 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -199,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},
@@ -278,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
 };
 
@@ -721,7 +722,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_*).
@@ -745,7 +747,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;