From 41f5bd09b0d3c5f9232ff20d076f76cc41acad32 Mon Sep 17 00:00:00 2001 From: Bert Vermeulen Date: Fri, 25 Jan 2013 11:22:20 +0100 Subject: [PATCH] Deprecate SR_DI_TIMEBASES. This is replaced by SR_CONF_TIMEBASE. --- hardware/hantek-dso/api.c | 6 +++--- hardware/rigol-ds1xx2/api.c | 6 +++--- libsigrok.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c index 8ee795dd..474b96ed 100644 --- 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 5d6e3dc7..7a591292 100644 --- 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 0a48366b..88faae25 100644 --- 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, };