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

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

diff --git a/tos/chips/msp430/usart/HplMsp430Usart1P.nc b/tos/chips/msp430/usart/HplMsp430Usart1P.nc
index d35e9f502762bc173eceaaaf9a1a7300beb5fc4a..d5a8a268b54080e3a95b2a97463a84d77c51ee26 100644 (file)
--- a/tos/chips/msp430/usart/HplMsp430Usart1P.nc
+++ b/tos/chips/msp430/usart/HplMsp430Usart1P.nc
@@ -80,8 +80,6 @@ module HplMsp430Usart1P {
   uses interface HplMsp430GeneralIO as UCLK;
   uses interface HplMsp430GeneralIO as URXD;
   uses interface HplMsp430GeneralIO as UTXD;
-  uses interface HplMsp430InterruptSig as SIGNAL_UART1RX_VECTOR;
-  uses interface HplMsp430InterruptSig as SIGNAL_UART1TX_VECTOR;
 }
 
 implementation
@@ -93,12 +91,14 @@ implementation
   MSP430REG_NORACE(U1RCTL);
   MSP430REG_NORACE(U1TXBUF);
 
-  inline async event void SIGNAL_UART1RX_VECTOR.fired() {
+
+
+  TOSH_SIGNAL(UART1RX_VECTOR) {
     uint8_t temp = U1RXBUF;
     signal Interrupts.rxDone(temp);
   }
 
-  inline async event void SIGNAL_UART1TX_VECTOR.fired() {
+  TOSH_SIGNAL(UART1TX_VECTOR) {
     signal Interrupts.txDone();
   }