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 b5cb0c85209b4cb125022f04ddbdeeaa978d4ac9..d0021cd64720ce9c009070e2bdfbd6282bf4ac82 100644 (file)
--- 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 dff680fd7ddb43cda8720126fc0705772c64fbf4..9d75d9d9f940bebe5f3d90f27856e1cc760a2253 100644 (file)
--- 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 720031034ccd8dc9858527c5f8206cdaf4cac6f4..45eada48e2e7a5972823b945deef99492b28311d 100644 (file)
--- 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 ee57284498a5af9aa07129981ca83904113cd7d0..93b942227bb5baf4f5be13d088a5ab0203b2f296 100644 (file)
--- 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 605c426960f5d926d10670ec8582a70dc76383f6..4821f7b67a9b910c5398b2a1a1b4a8d28805cfe2 100644 (file)
--- 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 eaa2129bcf66a19168668cb6df7544951c741043..2312f6c65ea903032751cf789b557d662e60c571 100644 (file)
--- 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]() {}
 }