Reverting back to decentralized handling of interrupts on the msp430. Centralizing...

[tinyos-2.x.git] / tos / chips / msp430 / usart / HplMsp430Usart0P.nc

diff --git a/tos/chips/msp430/usart/HplMsp430Usart0P.nc b/tos/chips/msp430/usart/HplMsp430Usart0P.nc
index 228e2b14e85c823081bba0414e9c8a4f77b5ee8b..cf618bfbbdba8cc75855497c1102b256380c6293 100644 (file)
--- a/tos/chips/msp430/usart/HplMsp430Usart0P.nc
+++ b/tos/chips/msp430/usart/HplMsp430Usart0P.nc
@@ -82,8 +82,6 @@ module HplMsp430Usart0P {
   uses interface HplMsp430GeneralIO as UCLK;
   uses interface HplMsp430GeneralIO as URXD;
   uses interface HplMsp430GeneralIO as UTXD;
-  uses interface HplMsp430InterruptSig as SIGNAL_UART0RX_VECTOR;
-  uses interface HplMsp430InterruptSig as SIGNAL_UART0TX_VECTOR;
 }
 
 implementation
@@ -95,12 +93,12 @@ implementation
   MSP430REG_NORACE(U0RCTL);
   MSP430REG_NORACE(U0TXBUF);
   
-  inline async event void SIGNAL_UART0RX_VECTOR.fired() {
+  TOSH_SIGNAL(UART0RX_VECTOR) {
     uint8_t temp = U0RXBUF;
     signal Interrupts.rxDone(temp);
   }
   
-  inline async event void SIGNAL_UART0TX_VECTOR.fired() {
+  TOSH_SIGNAL(UART0TX_VECTOR) {
     if ( call HplI2C.isI2C() )
       signal I2CInterrupts.fired();
     else