summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/onewire.c9
-rw-r--r--include/onewire.h2
2 files changed, 7 insertions, 4 deletions
diff --git a/common/onewire.c b/common/onewire.c
index 43080d096e..cdb5837255 100644
--- a/common/onewire.c
+++ b/common/onewire.c
@@ -54,7 +54,10 @@ static int readbit(void)
/* Output low */
output0(T_RL);
- /* Delay to let slave release the line if it wants to send a 1-bit */
+ /*
+ * Delay to let peripheral release the line if it wants to send
+ * a 1-bit
+ */
udelay(T_MSR - T_RL);
/* Read bit */
@@ -100,14 +103,14 @@ static void writebit(int bit)
int onewire_reset(void)
{
- /* Start transaction with master reset pulse */
+ /* Start transaction with controller reset pulse */
output0(T_RSTL);
/* Wait for presence detect sample time.
*
* (Alternately, we could poll waiting for a 1-bit indicating our pulse
* has let go, then poll up to max time waiting for a 0-bit indicating
- * the slave has responded.)
+ * the peripheral has responded.)
*/
udelay(T_MSP);
diff --git a/include/onewire.h b/include/onewire.h
index e2fda26b7b..58899360a4 100644
--- a/include/onewire.h
+++ b/include/onewire.h
@@ -10,7 +10,7 @@
* functions are run at low priority, communication may be garbled. However,
* these functions are also slow enough (~1ms per call) that it's really not
* desirable to put them at high priority. So make sure you check the
- * confirmation code from the slave for any communication, and retry a few
+ * confirmation code from the peripheral for any communication, and retry a few
* times in case of failure.
*/