From: R. Steve McKown <rsmckown@gmail.com>
Date: Fri, 29 Oct 2010 18:03:01 +0000 (-0600)
Subject: i2cNak() -> i2cNack()
X-Git-Tag: release/2.1.1-4.5~6
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=a04046a3331f1baba1e6a568613fec5db58bbe7b

i2cNak() -> i2cNack()

Make this change because the MSP430 documentation calls the bit UCNACK...
---

diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt.nc b/tos/chips/msp430/usci/HplMsp430UsciInt.nc
index b5cb0c85..d0021cd6 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt.nc
@@ -74,7 +74,7 @@ interface HplMsp430UsciInt {
    * I2C mode only.  Indicates the device was expecting an ACK and it was not
    * received.
    */
-  async event void i2cNak();
+  async event void i2cNack();
 
   /**
    * I2C mode only.  Indicates the device has detected a start condition
diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
index dff680fd..9d75d9d9 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
@@ -91,7 +91,7 @@ implementation
     } else if (READ_FLAG(UCB0STAT, UCNACKIFG)) {
       CLR_FLAG(UCB0STAT, UCNACKIFG);
       CLR_FLAG(UC0IFG, UCB0TXIFG); /* Errata USCI25; 'reset' means clear? */
-      signal IntB.i2cNak();
+      signal IntB.i2cNack();
     } else if (READ_FLAG(UCB0STAT, UCSTTIFG)) {
       CLR_FLAG(UCB0STAT, UCSTTIFG);
       signal IntB.i2cStart();
@@ -119,7 +119,7 @@ implementation
   default async event void IntA.tx() {}
   /* i2c is not available for A devices, so the below are never signalled */
   default async event void IntA.i2cCal() {}
-  default async event void IntA.i2cNak() {}
+  default async event void IntA.i2cNack() {}
   default async event void IntA.i2cStart() {}
   default async event void IntA.i2cStop() {}
 
@@ -128,7 +128,7 @@ implementation
   default async event void IntB.rx(uint8_t byte) {}
   default async event void IntB.tx() {}
   default async event void IntB.i2cCal() {}
-  default async event void IntB.i2cNak() {}
+  default async event void IntB.i2cNack() {}
   default async event void IntB.i2cStart() {}
   default async event void IntB.i2cStop() {}
 }
diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
index 72003103..45eada48 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
@@ -84,7 +84,7 @@ implementation
     } else if (READ_FLAG(UCB1STAT, UCNACKIFG)) {
       CLR_FLAG(UCB1STAT, UCNACKIFG);
       CLR_FLAG(UC1IFG, UCB1TXIFG); /* Errata USCI25; 'reset' means clear? */
-      signal IntB.i2cNak();
+      signal IntB.i2cNack();
     } else if (READ_FLAG(UCB1STAT, UCSTTIFG)) {
       CLR_FLAG(UCB1STAT, UCSTTIFG);
       signal IntB.i2cStart();
@@ -112,7 +112,7 @@ implementation
   default async event void IntA.tx() {}
   /* i2c is not available for A devices, so the below are never signalled */
   default async event void IntA.i2cCal() {}
-  default async event void IntA.i2cNak() {}
+  default async event void IntA.i2cNack() {}
   default async event void IntA.i2cStart() {}
   default async event void IntA.i2cStop() {}
 
@@ -121,7 +121,7 @@ implementation
   default async event void IntB.rx(uint8_t byte) {}
   default async event void IntB.tx() {}
   default async event void IntB.i2cCal() {}
-  default async event void IntB.i2cNak() {}
+  default async event void IntB.i2cNack() {}
   default async event void IntB.i2cStart() {}
   default async event void IntB.i2cStop() {}
 }
diff --git a/tos/chips/msp430/usci/Msp430SpiP.nc b/tos/chips/msp430/usci/Msp430SpiP.nc
index ee572844..93b94222 100644
--- a/tos/chips/msp430/usci/Msp430SpiP.nc
+++ b/tos/chips/msp430/usci/Msp430SpiP.nc
@@ -317,7 +317,7 @@ implementation {
   async event void Interrupts.i2cStop() {}
   async event void Interrupts.i2cCal() {}
   async event void Interrupts.brk() {}
-  async event void Interrupts.i2cNak() {}
+  async event void Interrupts.i2cNack() {}
 
   default async command bool CSn.get() { return FALSE; }
 }
diff --git a/tos/chips/msp430/usci/Msp430UartP.nc b/tos/chips/msp430/usci/Msp430UartP.nc
index 605c4269..4821f7b6 100644
--- a/tos/chips/msp430/usci/Msp430UartP.nc
+++ b/tos/chips/msp430/usci/Msp430UartP.nc
@@ -289,7 +289,7 @@ implementation {
   async event void Interrupts.i2cStop() {}
   async event void Interrupts.i2cCal() {}
   async event void Interrupts.brk() {}
-  async event void Interrupts.i2cNak() {}
+  async event void Interrupts.i2cNack() {}
   async event void Counter.overflow() {}
 
   default async event void UartStream.sendDone( uint8_t* buf, uint16_t len,
diff --git a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
index eaa2129b..2312f6c6 100644
--- a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
+++ b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
@@ -66,10 +66,10 @@ implementation {
       signal Interrupts.i2cCal[call ArbiterInfo.userId()]();
   }
 
-  async event void RawInt.i2cNak()
+  async event void RawInt.i2cNack()
   {
     if (call ArbiterInfo.inUse())
-      signal Interrupts.i2cNak[call ArbiterInfo.userId()]();
+      signal Interrupts.i2cNack[call ArbiterInfo.userId()]();
   }
 
   async event void RawInt.i2cStart()
@@ -88,7 +88,7 @@ implementation {
   default async event void Interrupts.rx[uint8_t id](uint8_t byte) {}
   default async event void Interrupts.tx[uint8_t id]() {}
   default async event void Interrupts.i2cCal[uint8_t id]() {}
-  default async event void Interrupts.i2cNak[uint8_t id]() {}
+  default async event void Interrupts.i2cNack[uint8_t id]() {}
   default async event void Interrupts.i2cStart[uint8_t id]() {}
   default async event void Interrupts.i2cStop[uint8_t id]() {}
 }