X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusart%2FHplMsp430Usart1P.nc;h=d35e9f502762bc173eceaaaf9a1a7300beb5fc4a;hb=26d7f5a6239a0f8fbb76588b3562654823acd43f;hp=d5a8a268b54080e3a95b2a97463a84d77c51ee26;hpb=944bc0204b7ce507a6e3fc46fb845f55545b237b;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usart/HplMsp430Usart1P.nc b/tos/chips/msp430/usart/HplMsp430Usart1P.nc
index d5a8a268..d35e9f50 100644
--- a/tos/chips/msp430/usart/HplMsp430Usart1P.nc
+++ b/tos/chips/msp430/usart/HplMsp430Usart1P.nc
@@ -80,6 +80,8 @@ 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
@@ -91,14 +93,12 @@ implementation
   MSP430REG_NORACE(U1RCTL);
   MSP430REG_NORACE(U1TXBUF);
 
-
-
-  TOSH_SIGNAL(UART1RX_VECTOR) {
+  inline async event void SIGNAL_UART1RX_VECTOR.fired() {
     uint8_t temp = U1RXBUF;
     signal Interrupts.rxDone(temp);
   }
 
-  TOSH_SIGNAL(UART1TX_VECTOR) {
+  inline async event void SIGNAL_UART1TX_VECTOR.fired() {
     signal Interrupts.txDone();
   }