From c4a3d36739346681572c7eda2a6243a8634474db Mon Sep 17 00:00:00 2001
From: "R. Steve McKown" <rsmckown@gmail.com>
Date: Fri, 15 Jan 2010 08:42:58 -0700
Subject: [PATCH] Make USCI interrupt comments more clear and accurate.

---
 tos/chips/msp430/usci/HplMsp430UsciInt0P.nc | 11 +++++++----
 tos/chips/msp430/usci/HplMsp430UsciInt1P.nc | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
index 65ee5be1..1ba7ef20 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt0P.nc
@@ -62,8 +62,9 @@ implementation
   MSP430REG_NORACE(UCB0RXBUF);
 #endif
 
-  /* This USCI_Ax and USCI_Bx interrupt vector signals receive events for UART
-   * and SPI modes, and status events for I2C modes.  Only Bx can do I2C.
+  /* This interrupt vector signals receive events.  USCI_A0 can receive events
+   * for UART and SPI modes, while USCI_B0 can receive events for I2C and SPI
+   * modes.
    */
   TOSH_SIGNAL(USCIAB0RX_VECTOR) {
     if (READ_FLAG(UC0IFG, UCA0RXIFG)) {
@@ -87,8 +88,9 @@ implementation
       signal IntB.i2cStop();
   }
   
-  /* This USCI_Ax and USCI_Bx interrupt vector signals transmit events for UART
-   * and SPI modes, and rx/tx events for I2C modes.  Only Bx can do I2C.
+  /* This interrupt vector signals transmit events.  USCI_A0 can receive events
+   * for UART and SPI modes, while USCI_B0 can receive events for I2C and SPI
+   * modes.
    */
   TOSH_SIGNAL(USCIAB0TX_VECTOR) {
     if (READ_FLAG(UC0IFG, UCB0RXIFG))
@@ -108,6 +110,7 @@ implementation
   default async event void IntA.i2cStart() {}
   default async event void IntA.i2cStop() {}
 
+  /* UART is not available for B devices, so IntB.brk() is never sitnalled */
   default async event void IntB.brk() {}
   default async event void IntB.rx(uint8_t byte) {}
   default async event void IntB.tx() {}
diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
index c083cdb9..5fa0291c 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
@@ -55,8 +55,9 @@ implementation
   MSP430REG_NORACE(UCB1RXBUF);
 #endif
 
-  /* This USCI_Ax and USCI_Bx interrupt vector signals receive events for UART
-   * and SPI modes, and status events for I2C modes.  Only Bx can do I2C.
+  /* This interrupt vector signals receive events.  USCI_A1 can receive events
+   * for UART and SPI modes, while USCI_B1 can receive events for I2C and SPI
+   * modes.
    */
   TOSH_SIGNAL(USCIAB1RX_VECTOR) {
     if (READ_FLAG(UC1IFG, UCA1RXIFG)) {
@@ -80,8 +81,9 @@ implementation
       signal IntB.i2cStop();
   }
   
-  /* This USCI_Ax and USCI_Bx interrupt vector signals transmit events for UART
-   * and SPI modes, and rx/tx events for I2C modes.  Only Bx can do I2C.
+  /* This interrupt vector signals transmit events.  USCI_A1 can receive events
+   * for UART and SPI modes, while USCI_B1 can receive events for I2C and SPI
+   * modes.
    */
   TOSH_SIGNAL(USCIAB1TX_VECTOR) {
     if (READ_FLAG(UC1IFG, UCB1RXIFG))
@@ -101,6 +103,7 @@ implementation
   default async event void IntA.i2cStart() {}
   default async event void IntA.i2cStop() {}
 
+  /* UART is not available for B devices, so IntB.brk() is never sitnalled */
   default async event void IntB.brk() {}
   default async event void IntB.rx(uint8_t byte) {}
   default async event void IntB.tx() {}
-- 
2.39.2