Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / usci / Msp430UsciIntDispatchP.nc

diff --git a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
index 3c776048bdfe6899c9530b45fe105cc8ddfa250c..eaa2129bcf66a19168668cb6df7544951c741043 100644 (file)
--- a/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
+++ b/tos/chips/msp430/usci/Msp430UsciIntDispatchP.nc
@@ -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()
@@ -85,7 +85,7 @@ 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]() {}