sr/cli/gtk/qt: s/configuration/config/.

[libsigrok.git] / hardware / openbench-logic-sniffer / ols.c

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 971e032dc35ad654ee0ad0872bcdcfa80ed43fd0..33237527fbc4fffeb21e0573cdb1fe07acd74591 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -46,7 +46,7 @@
 #define O_NONBLOCK FIONBIO
 #endif
 
-static int capabilities[] = {
+static int hwcaps[] = {
        SR_HWCAP_LOGIC_ANALYZER,
        SR_HWCAP_SAMPLERATE,
        SR_HWCAP_CAPTURE_RATIO,
@@ -567,7 +567,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
 
        info = NULL;
        switch (dev_info_id) {
-       case SR_DI_INSTANCE:
+       case SR_DI_INST:
                info = sdi;
                break;
        case SR_DI_NUM_PROBES:
@@ -600,13 +600,12 @@ static int hw_get_status(int dev_index)
        return sdi->status;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-       return capabilities;
+       return hwcaps;
 }
 
-static int set_configuration_samplerate(struct sr_dev_inst *sdi,
-                                       uint64_t samplerate)
+static int config_set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
 {
        struct ols_dev *ols;
 
@@ -638,7 +637,7 @@ static int set_configuration_samplerate(struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int hw_set_configuration(int dev_index, int capability, void *value)
+static int hw_config_set(int dev_index, int hwcap, void *value)
 {
        struct sr_dev_inst *sdi;
        struct ols_dev *ols;
@@ -652,10 +651,10 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR;
 
-       switch (capability) {
+       switch (hwcap) {
        case SR_HWCAP_SAMPLERATE:
                tmp_u64 = value;
-               ret = set_configuration_samplerate(sdi, *tmp_u64);
+               ret = config_set_samplerate(sdi, *tmp_u64);
                break;
        case SR_HWCAP_PROBECONFIG:
                ret = configure_probes(ols, (GSList *) value);
@@ -1048,8 +1047,8 @@ SR_PRIV struct sr_dev_plugin ols_plugin_info = {
        .closedev = hw_closedev,
        .get_dev_info = hw_get_dev_info,
        .get_status = hw_get_status,
-       .get_capabilities = hw_get_capabilities,
-       .set_configuration = hw_set_configuration,
+       .hwcap_get_all = hw_hwcap_get_all,
+       .config_set = hw_config_set,
        .start_acquisition = hw_start_acquisition,
        .stop_acquisition = hw_stop_acquisition,
 };