Deprecate SR_DI_TIMEBASES.

[libsigrok.git] / hardware / rigol-ds1xx2 / api.c

diff --git a/hardware/rigol-ds1xx2/api.c b/hardware/rigol-ds1xx2/api.c
index 4eeacececfcf1675294929b4d2bc7b4ae8ee0bf3..7a5912920d2ea1a943d741bde50e54ffb0a171eb 100644 (file)
--- a/hardware/rigol-ds1xx2/api.c
+++ b/hardware/rigol-ds1xx2/api.c
@@ -332,18 +332,9 @@ 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;
-       case SR_DI_VDIVS:
-               *data = vdivs;
-               break;
-       case SR_DI_COUPLING:
-               *data = coupling;
-               break;
        default:
                return SR_ERR_ARG;
        }
@@ -439,6 +430,28 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
        return ret;
 }
 
+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;
+       case SR_CONF_VDIV:
+               *data = vdivs;
+               break;
+       case SR_CONF_TIMEBASE:
+               *data = timebases;
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data)
 {
@@ -509,6 +522,7 @@ SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info = {
        .dev_clear = clear_instances,
        .config_get = config_get,
        .config_set = config_set,
+       .config_list = config_list,
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
        .dev_acquisition_start = hw_dev_acquisition_start,