X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FHplMsp430UsciInt1P.nc;h=f6caca02be3731b5a43aea36c2e11cd5c8fed8a1;hb=be862ab07d080085823951d18dcb27a28a310ace;hp=45eada48e2e7a5972823b945deef99492b28311d;hpb=a04046a3331f1baba1e6a568613fec5db58bbe7b;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
index 45eada48..f6caca02 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciInt1P.nc
@@ -10,7 +10,7 @@
  * - Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in the
  *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the Technische Universität Berlin nor the names
+ * - Neither the name of the Titanium Mirror, Inc. nor the names
  *   of its contributors may be used to endorse or promote products derived
  *   from this software without specific prior written permission.
  *
@@ -100,7 +100,11 @@ implementation
    */
   TOSH_SIGNAL(USCIAB1TX_VECTOR) {
     if (READ_FLAG(UC1IFG & UC1IE, UCB1RXIE))
-      signal IntB.rx(UCB1RXBUF); /* I2C receive */
+      /* I2C receive.  Do not read UCB1RXBUF here, as the code receiving
+       * IntB.rx() may first need to set stop and/or start bits.  The receiver
+       * must read UCB1RXBUF.
+       */
+      signal IntB.rx(0);
     else if (READ_FLAG(UC1IFG & UC1IE, UCA1TXIFG))
       signal IntA.tx();
     else if (READ_FLAG(UC1IFG & UC1IE, UCB1TXIFG))