From: Uwe Hermann <redacted>
Date: Wed, 5 Mar 2014 19:48:54 +0000 (+0100)
Subject: Fix 'aquisition' typo in a few places.
X-Git-Tag: libsigrok-0.3.0~123
X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=a84f6ad38984dd8cee2e41a1f35a4ddf373d2dfd

Fix 'aquisition' typo in a few places.
---

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index a3e85c34..329fd170 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -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);
diff --git a/hardware/gmc-mh-1x-2x/protocol.c b/hardware/gmc-mh-1x-2x/protocol.c
index b5923043..d20c910b 100644
--- a/hardware/gmc-mh-1x-2x/protocol.c
+++ b/hardware/gmc-mh-1x-2x/protocol.c
@@ -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);
 
diff --git a/hardware/norma-dmm/protocol.c b/hardware/norma-dmm/protocol.c
index 207d1690..d5004a18 100644
--- a/hardware/norma-dmm/protocol.c
+++ b/hardware/norma-dmm/protocol.c
@@ -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);
diff --git a/hardware/sysclk-lwla/api.c b/hardware/sysclk-lwla/api.c
index d6c6267a..8e0a9634 100644
--- a/hardware/sysclk-lwla/api.c
+++ b/hardware/sysclk-lwla/api.c
@@ -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;
diff --git a/libsigrok.h b/libsigrok.h
index 810276c1..21468c87 100644
--- a/libsigrok.h
+++ b/libsigrok.h
@@ -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);