]> sigrok.org Git - libsigrok.git/commitdiff
Fix 'aquisition' typo in a few places.
authorUwe Hermann <redacted>
Wed, 5 Mar 2014 19:48:54 +0000 (20:48 +0100)
committerUwe Hermann <redacted>
Tue, 11 Mar 2014 18:42:20 +0000 (19:42 +0100)
hardware/demo/demo.c
hardware/gmc-mh-1x-2x/protocol.c
hardware/norma-dmm/protocol.c
hardware/sysclk-lwla/api.c
libsigrok.h

index a3e85c341108a395dd12e642736c7a074c49ade3..329fd170e79cf62868c6fc97fc82f65cf1fa45f2 100644 (file)
@@ -748,7 +748,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        (void)cb_data;
 
        devc = sdi->priv;
-       sr_dbg("Stopping aquisition.");
+       sr_dbg("Stopping acquisition.");
 
        sr_session_source_remove_channel(devc->channel);
        g_io_channel_shutdown(devc->channel, FALSE, NULL);
index b5923043570e55c4eaa8c89977d3dfc610e819ee..d20c910b73070fe5e6878f434d64efc6cc62600a 100644 (file)
@@ -1162,7 +1162,7 @@ SR_PRIV int gmc_mh_1x_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
@@ -1213,7 +1213,7 @@ SR_PRIV int gmc_mh_2x_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples))
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
index 207d1690840cbb81646449206ef7fa9f88e1bf61..d5004a180808ca9e5264d3c139c068bbd4f25df9 100644 (file)
@@ -401,7 +401,7 @@ SR_PRIV int norma_dmm_receive_data(int fd, int revents, void *cb_data)
                }
        }
 
-       /* If number of samples or time limit reached, stop aquisition. */
+       /* If number of samples or time limit reached, stop acquisition. */
        terminating = FALSE;
        if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
index d6c6267a22b1d526e87ecba2e2f7d08cee3931fe..8e0a9634b5b8c81a4a5f559b87f1c8fef1b87a2b 100644 (file)
@@ -552,7 +552,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->acquisition = acq;
        ret = lwla_setup_acquisition(sdi);
        if (ret != SR_OK) {
-               sr_err("Failed to set up aquisition.");
+               sr_err("Failed to set up acquisition.");
                devc->acquisition = NULL;
                lwla_free_acquisition_state(acq);
                return ret;
@@ -560,7 +560,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        ret = lwla_start_acquisition(sdi);
        if (ret != SR_OK) {
-               sr_err("Failed to start aquisition.");
+               sr_err("Failed to start acquisition.");
                devc->acquisition = NULL;
                lwla_free_acquisition_state(acq);
                return ret;
index 810276c1c650e1c3da75c3ab653abb50364b9608..21468c875a2dac2828dc59a28e128d8ce0d63e7a 100644 (file)
@@ -1011,10 +1011,10 @@ struct sr_dev_driver {
        int (*dev_open) (struct sr_dev_inst *sdi);
        /** Close device */
        int (*dev_close) (struct sr_dev_inst *sdi);
-       /** Begin data aquisition on the specified device. */
+       /** Begin data acquisition on the specified device. */
        int (*dev_acquisition_start) (const struct sr_dev_inst *sdi,
                        void *cb_data);
-       /** End data aquisition on the specified device. */
+       /** End data acquisition on the specified device. */
        int (*dev_acquisition_stop) (struct sr_dev_inst *sdi,
                        void *cb_data);