X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FMsp430UsciIntDispatchP.nc;h=cf676dfdbc1cd8a237501966f32e0f0513b884fa;hb=be862ab07d080085823951d18dcb27a28a310ace;hp=3c776048bdfe6899c9530b45fe105cc8ddfa250c;hpb=76eb4bee32f633c7046716c39fe046f5174aa859;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
index 3c776048..cf676dfd 100644
--- a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
+++ b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.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.
  *
@@ -26,15 +26,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /**
  * Interrupt dispatch for USCI_Ax and USCI_Bx devices.
- * 
- * @author R. Steve McKown <smckown@gmail.com>
+ *
+ * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 generic module Msp430UsciIntDispatchP() @safe() {
-  provides interface HplMsp430UsciIntB as Interrupts[uint8_t id];
+  provides interface HplMsp430UsciInt as Interrupts[uint8_t id];
   uses {
     interface HplMsp430UsciInt as RawInt;
     interface ArbiterInfo;
@@ -48,10 +48,10 @@ implementation {
       signal Interrupts.brk[call ArbiterInfo.userId()]();
   }
 
-  async event void RawInt.rx(char c)
+  async event void RawInt.rx(uint8_t byte)
   {
     if (call ArbiterInfo.inUse())
-      signal Interrupts.rx[call ArbiterInfo.userId()]();
+      signal Interrupts.rx[call ArbiterInfo.userId()](byte);
   }
 
   async event void RawInt.tx()
@@ -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()
@@ -85,10 +85,10 @@ implementation {
   }
 
   default async event void Interrupts.brk[uint8_t id]() {}
-  default async event void Interrupts.rx[uint8_t id]() {}
+  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]() {}
 }