sr: s/acquisition_*/dev_acquisition_*/.

These functions are per-device-instance, so use dev_ as prefix as with
the other ones.

diff --git a/hardware/alsa/alsa.c b/hardware/alsa/alsa.c
index 9a93aab80d1868faa504d286bc067b4b486da7bf..7335bdb5d61a6e6d7a146695ebfa49fa62ddfc4e 100644 (file)
--- a/hardware/alsa/alsa.c
+++ b/hardware/alsa/alsa.c
@@ -290,7 +290,7 @@ static int receive_data(int fd, int revents, void *user_data)
        return TRUE;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
 {
        struct sr_dev_inst *sdi;
        struct alsa *alsa;
@@ -383,7 +383,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
        return SR_OK;
 }
 
-static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
        /* Avoid compiler warnings. */
        dev_index = dev_index;
@@ -404,6 +404,6 @@ SR_PRIV struct sr_dev_plugin alsa_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 7eabef03f320d5b4b61087fc2c8d5a08ece92431..355a35877b2aa525601bd05a9efba15b2210d6fe 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -118,7 +118,7 @@ static const char *firmware_files[] = {
        "asix-sigma-phasor.fw", /* Frequency counter */
 };
 
-static int hw_acquisition_stop(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)
 {
@@ -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_acquisition_stop(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_acquisition_start(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_acquisition_start(int dev_index, gpointer session_data)
        return SR_OK;
 }
 
-static int hw_acquisition_stop(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;
@@ -1423,6 +1423,6 @@ SR_PRIV struct sr_dev_plugin asix_sigma_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_dev_acquisition_start = hw_dev_dev_acquisition_start,
+       .dev_dev_acquisition_stop = hw_dev_dev_acquisition_stop,
 };

diff --git a/hardware/chronovu-la8/chronovu-la8.c b/hardware/chronovu-la8/chronovu-la8.c
index b551fb7ed6b73c0864d24ddff9f686291bb5ce25..8855002ca234a88dda35b1bf975bc927d9975922 100644 (file)
--- a/hardware/chronovu-la8/chronovu-la8.c
+++ b/hardware/chronovu-la8/chronovu-la8.c
@@ -136,7 +136,7 @@ static int hwcaps[] = {
 
 /* Function prototypes. */
 static int la8_close_usb_reset_sequencer(struct la8 *la8);
-static int hw_acquisition_stop(int dev_index, gpointer session_data);
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data);
 static int la8_reset(struct la8 *la8);
 
 static void fill_supported_samplerates_if_needed(void)
@@ -990,7 +990,7 @@ static int receive_data(int fd, int revents, void *session_data)
        /* Get one block of data. */
        if ((ret = la8_read_block(la8)) < 0) {
                sr_err("la8: %s: la8_read_block error: %d", __func__, ret);
-               hw_acquisition_stop(sdi->index, session_data);
+               hw_dev_acquisition_stop(sdi->index, session_data);
                return FALSE;
        }
 
@@ -1006,13 +1006,13 @@ static int receive_data(int fd, int revents, void *session_data)
        for (i = 0; i < NUM_BLOCKS; i++)
                send_block_to_session_bus(la8, i);
 
-       hw_acquisition_stop(sdi->index, session_data);
+       hw_dev_acquisition_stop(sdi->index, session_data);
 
        // return FALSE; /* FIXME? */
        return TRUE;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 {
        struct sr_dev_inst *sdi;
        struct la8 *la8;
@@ -1087,7 +1087,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
        return SR_OK;
 }
 
-static int hw_acquisition_stop(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
        struct sr_dev_inst *sdi;
        struct la8 *la8;
@@ -1125,6 +1125,6 @@ SR_PRIV struct sr_dev_plugin chronovu_la8_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 2ba59cc81b271efabca07a4f20386820a5754c55..448c148bef15744f94ef643d9ae0a35e6907def5 100644 (file)
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -134,7 +134,7 @@ static int default_pattern = PATTERN_SIGROK;
 static GThread *my_thread;
 static int thread_running;
 
-static int hw_acquisition_stop(int dev_index, gpointer session_data);
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data);
 
 static int hw_init(const char *devinfo)
 {
@@ -405,7 +405,7 @@ static int receive_data(int fd, int revents, void *session_data)
        return TRUE;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 {
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
@@ -477,7 +477,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
        return SR_OK;
 }
 
-static int hw_acquisition_stop(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
        /* Avoid compiler warnings. */
        (void)dev_index;
@@ -501,6 +501,6 @@ SR_PRIV struct sr_dev_plugin demo_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/link-mso19/link-mso19.c b/hardware/link-mso19/link-mso19.c
index 5fe2deed26b8e02d5a6f9fe2b4d602e5afd4b893..0869df6233cc36745bd37c6e7193b4e10522d71e 100644 (file)
--- a/hardware/link-mso19/link-mso19.c
+++ b/hardware/link-mso19/link-mso19.c
@@ -743,7 +743,7 @@ static int receive_data(int fd, int revents, void *user_data)
        return TRUE;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
 {
        struct sr_dev_inst *sdi;
        struct mso *mso;
@@ -817,7 +817,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
 }
 
 /* FIXME */
-static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
        struct sr_datafeed_packet packet;
 
@@ -841,6 +841,6 @@ SR_PRIV struct sr_dev_plugin link_mso19_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 8791aae9a3d54c3f3b3cf0db7fef8e5fab0bf133..f7fcd5877a76d9522c3bc3f06760b06382674bac 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -871,7 +871,7 @@ static int receive_data(int fd, int revents, void *session_data)
        return TRUE;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_data)
 {
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
@@ -1024,7 +1024,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
        return SR_OK;
 }
 
-static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
        struct sr_datafeed_packet packet;
 
@@ -1049,6 +1049,6 @@ SR_PRIV struct sr_dev_plugin ols_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index fb3d448c144607c0bbb819ec2f14ff765945d0d2..8307220578ba0084b0b5c7e6de9b9fc541e3cc3d 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -94,7 +94,7 @@ static libusb_context *usb_context = NULL;
 static int new_saleae_logic_firmware = 0;
 
 static int hw_config_set(int dev_index, int hwcap, void *value);
-static int hw_acquisition_stop(int dev_index, gpointer session_dev_id);
+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.
@@ -680,7 +680,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        int cur_buflen, trigger_offset, i;
        unsigned char *cur_buf, *new_buf;
 
-       /* hw_acquisition_stop() is telling us to stop. */
+       /* hw_dev_acquisition_stop() is telling us to stop. */
        if (transfer == NULL)
                num_samples = -1;
 
@@ -723,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_acquisition_stop(-1, fx2->session_data);
+                       hw_dev_acquisition_stop(-1, fx2->session_data);
                }
                return;
        } else {
@@ -797,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_acquisition_stop(-1, fx2->session_data);
+                       hw_dev_acquisition_stop(-1, fx2->session_data);
                }
        } else {
                /*
@@ -807,7 +807,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        }
 }
 
-static int hw_acquisition_start(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;
@@ -873,7 +873,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_acquisition_stop(int dev_index, gpointer session_data)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_data)
 {
        struct sr_datafeed_packet packet;
 
@@ -902,6 +902,6 @@ SR_PRIV struct sr_dev_plugin saleae_logic_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/hardware/zeroplus-logic-cube/zeroplus.c b/hardware/zeroplus-logic-cube/zeroplus.c
index aa7a65dc8c64322d280fe49b3373f0803bcc4c69..7390ec7cf25fded02cf6fb532d2fb8791f250fae 100644 (file)
--- a/hardware/zeroplus-logic-cube/zeroplus.c
+++ b/hardware/zeroplus-logic-cube/zeroplus.c
@@ -627,7 +627,7 @@ static int hw_config_set(int dev_index, int hwcap, void *value)
        }
 }
 
-static int hw_acquisition_start(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;
@@ -703,7 +703,7 @@ static int hw_acquisition_start(int dev_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring dev_index. */
-static int hw_acquisition_stop(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_stop(int dev_index, gpointer session_dev_id)
 {
        struct sr_datafeed_packet packet;
        struct sr_dev_inst *sdi;
@@ -740,6 +740,6 @@ SR_PRIV struct sr_dev_plugin zeroplus_logic_cube_plugin_info = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = hw_acquisition_stop,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = hw_dev_acquisition_stop,
 };

diff --git a/session.c b/session.c
index 13e606194a126d60f086e3ac5e0c320501668596..2c066f9454553ac757f30ab6115fc3c7b728afa9 100644 (file)
--- a/session.c
+++ b/session.c
@@ -276,7 +276,7 @@ SR_API int sr_session_start(void)
        for (l = session->devs; l; l = l->next) {
                dev = l->data;
                /* TODO: Check for dev != NULL. */
-               if ((ret = dev->plugin->acquisition_start(
+               if ((ret = dev->plugin->dev_acquisition_start(
                                dev->plugin_index, dev)) != SR_OK) {
                        sr_err("session: %s: could not start an acquisition "
                               "(%d)", __func__, ret);
@@ -373,8 +373,8 @@ SR_API int sr_session_stop(void)
                dev = l->data;
                /* Check for dev != NULL. */
                if (dev->plugin) {
-                       if (dev->plugin->acquisition_stop)
-                               dev->plugin->acquisition_stop(dev->plugin_index, dev);
+                       if (dev->plugin->dev_acquisition_stop)
+                               dev->plugin->dev_acquisition_stop(dev->plugin_index, dev);
                        if (dev->plugin->cleanup)
                                dev->plugin->cleanup();
                }

diff --git a/session_driver.c b/session_driver.c
index 1ed0f58ed95833eebf11a7fda0ebc8777ae46afb..17a8473c0973259c37ae36ced750fff85926cfaf 100644 (file)
--- a/session_driver.c
+++ b/session_driver.c
@@ -269,7 +269,7 @@ static int hw_config_set(int dev_index, int hwcap, void *value)
        return SR_OK;
 }
 
-static int hw_acquisition_start(int dev_index, gpointer session_dev_id)
+static int hw_dev_acquisition_start(int dev_index, gpointer session_dev_id)
 {
        struct zip_stat zs;
        struct session_vdev *vdev;
@@ -343,6 +343,6 @@ SR_PRIV struct sr_dev_plugin session_driver = {
        .dev_status_get = hw_dev_status_get,
        .hwcap_get_all = hw_hwcap_get_all,
        .config_set = hw_config_set,
-       .acquisition_start = hw_acquisition_start,
-       .acquisition_stop = NULL,
+       .dev_acquisition_start = hw_dev_acquisition_start,
+       .dev_acquisition_stop = NULL,
 };

diff --git a/sigrok.h b/sigrok.h
index 300e8a0b09e8cfc3653ce7cf4007007b8497cd7e..d1ace96d5bf74efa6dc59d692eb728b6121d99ee 100644 (file)
--- a/sigrok.h
+++ b/sigrok.h
@@ -353,8 +353,8 @@ struct sr_dev_plugin {
        int (*dev_status_get) (int dev_index);
        int *(*hwcap_get_all) (void);
        int (*config_set) (int dev_index, int hwcap, void *value);
-       int (*acquisition_start) (int dev_index, gpointer session_dev_id);
-       int (*acquisition_stop) (int dev_index, gpointer session_dev_id);
+       int (*dev_acquisition_start) (int dev_index, gpointer session_dev_id);
+       int (*dev_acquisition_stop) (int dev_index, gpointer session_dev_id);
 };
 
 struct sr_session {