Deprecate SR_DI_COUPLING.

This is replaced by SR_CONF_COUPLING.

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index bf3fefabab114b255d484b9b93f8ef30ebad9b67..920a3c56a0e90467643b263f3941b64fd229d5e2 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -444,9 +444,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_VDIVS:
                *data = vdivs;
                break;
-       case SR_DI_COUPLING:
-               *data = coupling;
-               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_BUFFERSIZE:
                *data = buffersizes;
                break;
+       case SR_CONF_COUPLING:
+               *data = coupling;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 25d68563b429e197a2a76e1f5a535c8c9888654b..33aaecd22056fecd6c305ad26fdffe9875a24acb 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -341,9 +341,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_VDIVS:
                *data = vdivs;
                break;
-       case SR_DI_COUPLING:
-               *data = coupling;
-               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
        (void)sdi;
 
        switch (key) {
+       case SR_CONF_COUPLING:
+               *data = coupling;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/libsigrok.h b/libsigrok.h
index 04776ee8068122b4482e8a2c04ca0874ee206a0f..1346d76ce109e2bfe91f25d6db1febc915b66951 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -561,8 +561,6 @@ enum {
        SR_DI_FILTERS,
        /** Valid volts/div values. */
        SR_DI_VDIVS,
-       /** Coupling options. */
-       SR_DI_COUPLING,
 };
 
 /*