Deprecate SR_DI_HWCAPS.

[libsigrok.git] / hardware / uni-t-dmm / api.c

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index cb7c696611a2050d3d24385870485e5a0dda0314..7511283823b145c95f3af1aca47ca5e520dc96a5 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -196,17 +196,7 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
        case SR_DI_HWOPTS:
                *data = hwopts;
                break;
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               sr_spew("%s: Returning hwcaps.", __func__);
-               break;
-       case SR_DI_SAMPLERATES:
-               /* TODO: Get rid of this. */
-               *data = NULL;
-               sr_spew("%s: Returning samplerates.", __func__);
-               return SR_ERR_ARG;
-               break;
-       case SR_DI_CUR_SAMPLERATE:
+       case SR_CONF_SAMPLERATE:
                /* TODO: Get rid of this. */
                *data = NULL;
                sr_spew("%s: Returning current samplerate.", __func__);
@@ -255,6 +245,22 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+       (void)sdi;
+
+       switch (key) {
+       case SR_CONF_DEVICE_OPTIONS:
+               *data = hwcaps;
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+
+       return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
                                    void *cb_data)
 {
@@ -317,6 +323,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut61d_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,
@@ -335,6 +342,7 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_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,