Deprecate SR_DI_VDIVS.

This is replaced by SR_CONF_VDIV.

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 920a3c56a0e90467643b263f3941b64fd229d5e2..f797b709f95d4bb2c975512ac5f8b388651b20b6 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -441,9 +441,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_FILTERS:
                *data = filter_targets;
                break;
-       case SR_DI_VDIVS:
-               *data = vdivs;
-               break;
        /* TODO remove this */
        case SR_CONF_SAMPLERATE:
                *data = &tmp;
@@ -586,6 +583,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        case SR_CONF_COUPLING:
                *data = coupling;
                break;
+       case SR_CONF_VDIV:
+               *data = vdivs;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 33aaecd22056fecd6c305ad26fdffe9875a24acb..5d6e3dc786b71277d1252c13f6a69ad339d8cc0a 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -338,9 +338,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_TRIGGER_SOURCES:
                *data = trigger_sources;
                break;
-       case SR_DI_VDIVS:
-               *data = vdivs;
-               break;
        default:
                return SR_ERR_ARG;
        }
@@ -445,6 +442,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        case SR_CONF_COUPLING:
                *data = coupling;
                break;
+       case SR_CONF_VDIV:
+               *data = vdivs;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/libsigrok.h b/libsigrok.h
index 1346d76ce109e2bfe91f25d6db1febc915b66951..9add374be9a24cdc3610b49b892309707a90451d 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -559,8 +559,6 @@ enum {
        SR_DI_TRIGGER_SOURCES,
        /** Supported filter targets. */
        SR_DI_FILTERS,
-       /** Valid volts/div values. */
-       SR_DI_VDIVS,
 };
 
 /*