drivers: rename and reorganize config get/set

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

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index b143a358e71499bb86d839ca10dc4e29ba88de37..6589d4f030dc772a7c14a7b98f0669eb7d673504 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -373,12 +373,11 @@ static int hw_cleanup(int dmm)
        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) {
+       switch (id) {
        case SR_DI_HWOPTS:
                *data = hwopts;
                break;
@@ -392,8 +391,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;
 
@@ -405,7 +403,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                return SR_ERR_BUG;
        }
 
-       switch (hwcap) {
+       switch (id) {
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
                sr_dbg("Setting sample limit to %" PRIu64 ".",
@@ -417,7 +415,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                       devc->limit_msec);
                break;
        default:
-               sr_err("Unknown capability: %d.", hwcap);
+               sr_err("Unknown capability: %d.", id);
                return SR_ERR;
                break;
        }
@@ -522,10 +520,10 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .scan = hw_scan_##ID_UPPER, \
        .dev_list = hw_dev_list_##ID_UPPER, \
        .dev_clear = clear_instances_##ID_UPPER, \
+       .config_get = config_get, \
+       .config_set = config_set, \
        .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_##ID_UPPER, \
        .dev_acquisition_stop = hw_dev_acquisition_stop, \
        .priv = NULL, \