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

[libsigrok.git] / hardware / saleae-logic / saleae-logic.c

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index afed06c68a01c24d6d3c6399eaabfce016ae9712..12ede4e168fb69d7053e4ba9bab07b1ddf35d987 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -36,7 +36,7 @@ static struct fx2_profile supported_fx2[] = {
        { 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static int capabilities[] = {
+static int hwcaps[] = {
        SR_HWCAP_LOGIC_ANALYZER,
        SR_HWCAP_SAMPLERATE,
 
@@ -93,7 +93,7 @@ static libusb_context *usb_context = NULL;
 
 static int new_saleae_logic_firmware = 0;
 
-static int hw_set_configuration(int dev_index, int capability, void *value);
+static int hw_config_set(int dev_index, int hwcap, void *value);
 static int hw_stop_acquisition(int dev_index, gpointer session_dev_id);
 
 /**
@@ -440,7 +440,7 @@ static int hw_opendev(int dev_index)
 
        if (fx2->cur_samplerate == 0) {
                /* Samplerate hasn't been set; default to the slowest one. */
-               if (hw_set_configuration(dev_index, SR_HWCAP_SAMPLERATE,
+               if (hw_config_set(dev_index, SR_HWCAP_SAMPLERATE,
                    &supported_samplerates[0]) == SR_ERR)
                        return SR_ERR;
        }
@@ -545,9 +545,9 @@ static int hw_get_status(int dev_index)
                return SR_ST_NOT_FOUND;
 }
 
-static int *hw_get_capabilities(void)
+static int *hw_hwcap_get_all(void)
 {
-       return capabilities;
+       return hwcaps;
 }
 
 static uint8_t new_firmware_divider_value(uint64_t samplerate)
@@ -591,8 +591,7 @@ static uint8_t new_firmware_divider_value(uint64_t samplerate)
        return 0;
 }
 
-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 fx2_dev *fx2;
        uint8_t divider;
@@ -628,7 +627,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 fx2_dev *fx2;
@@ -639,12 +638,12 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
                return SR_ERR;
        fx2 = sdi->priv;
 
-       if (capability == SR_HWCAP_SAMPLERATE) {
+       if (hwcap == SR_HWCAP_SAMPLERATE) {
                tmp_u64 = value;
-               ret = set_configuration_samplerate(sdi, *tmp_u64);
-       } else if (capability == SR_HWCAP_PROBECONFIG) {
+               ret = config_set_samplerate(sdi, *tmp_u64);
+       } else if (hwcap == SR_HWCAP_PROBECONFIG) {
                ret = configure_probes(fx2, (GSList *) value);
-       } else if (capability == SR_HWCAP_LIMIT_SAMPLES) {
+       } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
                tmp_u64 = value;
                fx2->limit_samples = *tmp_u64;
                ret = SR_OK;
@@ -901,8 +900,8 @@ SR_PRIV struct sr_dev_plugin saleae_logic_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,
 };