Deprecate SR_DI_TIMEBASES.

This is replaced by SR_CONF_TIMEBASE.

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 8ee795dda2b0515b24223adaecce6ab919cdc2bb..474b96ed624b93f14c7dde000cb3bc9ab0512985 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -432,9 +432,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_TIMEBASES:
-               *data = timebases;
-               break;
        case SR_DI_TRIGGER_SOURCES:
                *data = trigger_sources;
                break;
@@ -586,6 +583,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        case SR_CONF_FILTER:
                *data = filter_targets;
                break;
+       case SR_CONF_TIMEBASE:
+               *data = timebases;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 5d6e3dc786b71277d1252c13f6a69ad339d8cc0a..7a5912920d2ea1a943d741bde50e54ffb0a171eb 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -332,9 +332,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
-       case SR_DI_TIMEBASES:
-               *data = timebases;
-               break;
        case SR_DI_TRIGGER_SOURCES:
                *data = trigger_sources;
                break;
@@ -445,6 +442,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
        case SR_CONF_VDIV:
                *data = vdivs;
                break;
+       case SR_CONF_TIMEBASE:
+               *data = timebases;
+               break;
        default:
                return SR_ERR_ARG;
        }

diff --git a/libsigrok.h b/libsigrok.h
index 0a48366b239529b0e50ba3199a0ee7a3e662dbaf..88faae2536bc5937fbe62ed6b77228c53e96bc07 100644 (file)
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -553,8 +553,6 @@ enum {
        SR_DI_HWCAPS,
        /** Types of logic trigger supported, out of "01crf" (char *). */
        SR_DI_TRIGGER_TYPES,
-       /** Supported time bases. */
-       SR_DI_TIMEBASES,
        /** Supported trigger sources. */
        SR_DI_TRIGGER_SOURCES,
 };