sr: s/acquisition_*/dev_acquisition_*/.

[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 6549473c3e2d70e8714f8b439be6581ccbdc49a5..8307220578ba0084b0b5c7e6de9b9fc541e3cc3d 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,
 
@@ -87,14 +87,14 @@ static struct sr_samplerates samplerates = {
        supported_samplerates,
 };
 
-/* List of struct sr_dev_inst, maintained by opendev()/closedev(). */
+/* List of struct sr_dev_inst, maintained by dev_open()/dev_close(). */
 static GSList *dev_insts = NULL;
 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_stop_acquisition(int dev_index, gpointer session_dev_id);
+static int hw_config_set(int dev_index, int hwcap, void *value);
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id);
 
 /**
  * Check the USB configuration to determine if this is a Saleae Logic.
@@ -393,7 +393,7 @@ static int hw_init(const char *devinfo)
        return devcnt;
 }
 
-static int hw_opendev(int dev_index)
+static int hw_dev_open(int dev_index)
 {
        GTimeVal cur_time;
        struct sr_dev_inst *sdi;
@@ -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;
        }
@@ -448,7 +448,7 @@ static int hw_opendev(int dev_index)
        return SR_OK;
 }
 
-static int hw_closedev(int dev_index)
+static int hw_dev_close(int dev_index)
 {
        struct sr_dev_inst *sdi;
 
@@ -500,7 +500,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 fx2_dev *fx2;
@@ -511,7 +511,7 @@ static void *hw_get_dev_info(int dev_index, int dev_info_id)
        fx2 = sdi->priv;
 
        switch (dev_info_id) {
-       case SR_DI_INSTANCE:
+       case SR_DI_INST:
                info = sdi;
                break;
        case SR_DI_NUM_PROBES:
@@ -534,7 +534,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;
 
@@ -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;
@@ -681,7 +680,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        int cur_buflen, trigger_offset, i;
        unsigned char *cur_buf, *new_buf;
 
-       /* hw_stop_acquisition() is telling us to stop. */
+       /* hw_dev_acquisition_stop() is telling us to stop. */
        if (transfer == NULL)
                num_samples = -1;
 
@@ -724,7 +723,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
                         * The FX2 gave up. End the acquisition, the frontend
                         * will work out that the samplecount is short.
                         */
-                       hw_stop_acquisition(-1, fx2->session_data);
+                       hw_dev_acquisition_stop(-1, fx2->session_data);
                }
                return;
        } else {
@@ -798,7 +797,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
 
                num_samples += cur_buflen;
                if (fx2->limit_samples && (unsigned int) num_samples > fx2->limit_samples) {
-                       hw_stop_acquisition(-1, fx2->session_data);
+                       hw_dev_acquisition_stop(-1, fx2->session_data);
                }
        } else {
                /*
@@ -808,7 +807,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        }
 }
 
-static int hw_start_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 {
        struct sr_dev_inst *sdi;
        struct sr_datafeed_packet *packet;
@@ -874,7 +873,7 @@ static int hw_start_acquisition(int dev_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_stop_acquisition(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
        struct sr_datafeed_packet packet;
 
@@ -897,12 +896,12 @@ SR_PRIV struct sr_dev_plugin saleae_logic_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_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };