Deprecate SR_DI_HWCAPS.

[libsigrok.git] / hardware / victor-dmm / api.c

diff --git a/hardware/victor-dmm/api.c b/hardware/victor-dmm/api.c
index b847fbf9e8352dbb62087b55194a718e596cfafc..1e8cd4ae1c0659748ca0769fed26403ce58004a3 100644 (file)
--- a/hardware/victor-dmm/api.c
+++ b/hardware/victor-dmm/api.c
@@ -244,15 +244,11 @@ static int hw_cleanup(void)
        return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-                      const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
        (void)sdi;
 
-       switch (info_id) {
-       case SR_DI_HWCAPS:
-               *data = hwcaps;
-               break;
+       switch (id) {
        default:
                return SR_ERR_ARG;
        }
@@ -260,8 +256,7 @@ static int hw_info_get(int info_id, const void **data,
        return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-                            const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        gint64 now;
@@ -279,7 +274,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
        devc = sdi->priv;
        ret = SR_OK;
-       switch (hwcap) {
+       switch (id) {
        case SR_CONF_LIMIT_MSEC:
                devc->limit_msec = *(const int64_t *)value;
                now = g_get_monotonic_time() / 1000;
@@ -293,13 +288,29 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                       devc->limit_samples);
                break;
        default:
-               sr_err("Unknown hardware capability: %d.", hwcap);
+               sr_err("Unknown hardware capability: %d.", id);
                ret = SR_ERR_ARG;
        }
 
        return ret;
 }
 
+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 void receive_transfer(struct libusb_transfer *transfer)
 {
        struct dev_context *devc;
@@ -466,10 +477,11 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
        .scan = hw_scan,
        .dev_list = hw_dev_list,
        .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,
-       .info_get = hw_info_get,
-       .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,
        .priv = NULL,