Fix #442 by renaming sr_dev_driver.priv to .context

[libsigrok.git] / src / hardware / conrad-digi-35-cpu / api.c

diff --git a/src/hardware/conrad-digi-35-cpu/api.c b/src/hardware/conrad-digi-35-cpu/api.c
index a9ea575e5d9f5f82bdcc41471328e53a8d2898ba..5af4b051a26fd3ed04f45964e534462d7541df19 100644 (file)
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -33,8 +33,8 @@ static const uint32_t scanopts[] = {
 
 static const uint32_t devopts[] = {
        SR_CONF_POWER_SUPPLY,
-       SR_CONF_OUTPUT_VOLTAGE | SR_CONF_SET,
-       SR_CONF_OUTPUT_CURRENT | SR_CONF_SET,
+       SR_CONF_VOLTAGE | SR_CONF_SET,
+       SR_CONF_CURRENT | SR_CONF_SET,
        SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
 };
 
@@ -55,7 +55,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn, *serialcomm;
 
        devices = NULL;
-       drvc = di->priv;
+       drvc = di->context;
        drvc->instances = NULL;
        conn = serialcomm = NULL;
 
@@ -107,7 +107,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static int cleanup(const struct sr_dev_driver *di)
@@ -128,7 +128,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        ret = SR_OK;
        switch (key) {
-       case SR_CONF_OUTPUT_VOLTAGE:
+       case SR_CONF_VOLTAGE:
                dblval = g_variant_get_double(data);
                if ((dblval < 0.0) || (dblval > 35.0)) {
                        sr_err("Voltage out of range (0 - 35.0)!");
@@ -136,7 +136,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                }
                ret = send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
                break;
-       case SR_CONF_OUTPUT_CURRENT:
+       case SR_CONF_CURRENT:
                dblval = g_variant_get_double(data);
                if ((dblval < 0.01) || (dblval > 2.55)) {
                        sr_err("Current out of range (0 - 2.55)!");
@@ -218,5 +218,5 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info = {
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };