sr: s/acquisition_*/dev_acquisition_*/.

[libsigrok.git] / hardware / asix-sigma / asix-sigma.c

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index d6fd7864b22a0b0c1479ee20c274da8480c5dd87..355a35877b2aa525601bd05a9efba15b2210d6fe 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -84,7 +84,7 @@ static struct sr_samplerates samplerates = {
        supported_samplerates,
 };
 
-static int capabilities[] = {
+static int hwcaps[] = {
        SR_HWCAP_LOGIC_ANALYZER,
        SR_HWCAP_SAMPLERATE,
        SR_HWCAP_CAPTURE_RATIO,
@@ -118,7 +118,7 @@ static const char *firmware_files[] = {
        "asix-sigma-phasor.fw", /* Frequency counter */
 };
 
-static int hw_stop_acquisition(int dev_index, gpointer session_data);
+static int hw_dev_dev_acquisition_stop(int dev_index, gpointer session_data);
 
 static int sigma_read(void *buf, size_t size, struct sigma *sigma)
 {
@@ -555,7 +555,7 @@ static int upload_firmware(int firmware_idx, struct sigma *sigma)
        return SR_OK;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
        struct sr_dev_inst *sdi;
        struct sigma *sigma;
@@ -698,7 +698,7 @@ static int configure_probes(struct sr_dev_inst *sdi, GSList *probes)
        return SR_OK;
 }
 
-static int hw_closedev(int dev_index)
+static int hw_dev_close(int dev_index)
 {
        struct sr_dev_inst *sdi;
        struct sigma *sigma;
@@ -744,7 +744,7 @@ static int hw_cleanup(void)
        return ret;
 }
 
-static void *hw_get_dev_info(int dev_index, int dev_info_id)
+static void *hw_dev_info_get(int dev_index, int dev_info_id)
 {
        struct sr_dev_inst *sdi;
        struct sigma *sigma;
@@ -781,7 +781,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
        return info;
 }
 
-static int hw_get_status(int dev_index)
+static int hw_dev_status_get(int dev_index)
 {
        struct sr_dev_inst *sdi;
 
@@ -792,12 +792,12 @@ 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 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 sigma *sigma;
@@ -808,17 +808,17 @@ static int hw_set_configuration(int dev_index, int capability, void *value)
 
        sigma = sdi->priv;
 
-       if (capability == SR_HWCAP_SAMPLERATE) {
+       if (hwcap == SR_HWCAP_SAMPLERATE) {
                ret = set_samplerate(sdi, *(uint64_t*) value);
-       } else if (capability == SR_HWCAP_PROBECONFIG) {
+       } else if (hwcap == SR_HWCAP_PROBECONFIG) {
                ret = configure_probes(sdi, value);
-       } else if (capability == SR_HWCAP_LIMIT_MSEC) {
+       } else if (hwcap == SR_HWCAP_LIMIT_MSEC) {
                sigma->limit_msec = *(uint64_t*) value;
                if (sigma->limit_msec > 0)
                        ret = SR_OK;
                else
                        ret = SR_ERR;
-       } else if (capability == SR_HWCAP_CAPTURE_RATIO) {
+       } else if (hwcap == SR_HWCAP_CAPTURE_RATIO) {
                sigma->capture_ratio = *(uint64_t*) value;
                if (sigma->capture_ratio < 0 || sigma->capture_ratio > 100)
                        ret = SR_ERR;
@@ -1034,7 +1034,7 @@ static int receive_data(int fd, int revents, void *session_data)
                if (running_msec < sigma->limit_msec && numchunks < 32767)
                        return FALSE;
 
-               hw_stop_acquisition(sdi->index, session_data);
+               hw_dev_dev_acquisition_stop(sdi->index, session_data);
 
                return FALSE;
 
@@ -1252,7 +1252,7 @@ static int build_basic_trigger(struct triggerlut *lut, struct sigma *sigma)
        return SR_OK;
 }
 
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_dev_acquisition_start(int dev_index, gpointer session_data)
 {
        struct sr_dev_inst *sdi;
        struct sigma *sigma;
@@ -1369,7 +1369,7 @@ static int hw_start_acquisition(int dev_index, gpointer session_data)
        return SR_OK;
 }
 
-static int hw_stop_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
        struct sr_dev_inst *sdi;
        struct sigma *sigma;
@@ -1417,12 +1417,12 @@ SR_PRIV struct sr_dev_plugin asix_sigma_plugin_info = {
        .api_version = 1,
        .init = hw_init,
        .cleanup = hw_cleanup,
-       .opendev = hw_opendev,
-       .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,
-       .start_acquisition = hw_start_acquisition,
-       .stop_acquisition = hw_stop_acquisition,
+       .dev_open = hw_dev_open,
+       .dev_close = hw_dev_close,
+       .dev_info_get = hw_dev_info_get,
+       .dev_status_get = hw_dev_status_get,
+       .hwcap_get_all = hw_hwcap_get_all,
+       .config_set = hw_config_set,
+       .dev_dev_acquisition_start = hw_dev_dev_acquisition_start,
+       .dev_dev_acquisition_stop = hw_dev_dev_acquisition_stop,
 };