[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/usart HplMsp430Usart0C.nc, 1.5, 1.6 HplMsp430Usart0P.nc, 1.5, 1.6 HplMsp430Usart1C.nc, 1.5, 1.6 HplMsp430Usart1P.nc, 1.5, 1.6

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31631/usart

Modified Files:
	HplMsp430Usart0C.nc HplMsp430Usart0P.nc HplMsp430Usart1C.nc 
	HplMsp430Usart1P.nc 
Log Message:
Reverting back to decentralized handling of interrupts on the msp430.  Centralizing them has the side effect of forcing all interrupt handlers to be included regardless of whether the component that actually DEPENDS on it is included or not.  Leads to unnecessary code bloat.  Original motivation for centralizing them in the first place was in anticipation of adding tosthreads in the upcoming release.  A better way of supporting them without the need for centralized interrupt handlers was found, hence the rollback.

Index: HplMsp430Usart0C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/HplMsp430Usart0C.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplMsp430Usart0C.nc	17 Apr 2008 22:38:34 -0000	1.5
--- HplMsp430Usart0C.nc	15 May 2008 23:57:13 -0000	1.6
***************
*** 86,91 ****
    HplUsartP.UTXD -> GIO.UTXD0;
    
-   components HplMsp430InterruptSigP;
-   HplUsartP.SIGNAL_UART0RX_VECTOR -> HplMsp430InterruptSigP.SIGNAL_UART0RX_VECTOR;
-   HplUsartP.SIGNAL_UART0TX_VECTOR -> HplMsp430InterruptSigP.SIGNAL_UART0TX_VECTOR;
  }
--- 86,88 ----

Index: HplMsp430Usart0P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/HplMsp430Usart0P.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplMsp430Usart0P.nc	17 Apr 2008 22:38:34 -0000	1.5
--- HplMsp430Usart0P.nc	15 May 2008 23:57:13 -0000	1.6
***************
*** 83,88 ****
    uses interface HplMsp430GeneralIO as URXD;
    uses interface HplMsp430GeneralIO as UTXD;
-   uses interface HplMsp430InterruptSig as SIGNAL_UART0RX_VECTOR;
-   uses interface HplMsp430InterruptSig as SIGNAL_UART0TX_VECTOR;
  }
  
--- 83,86 ----
***************
*** 96,105 ****
    MSP430REG_NORACE(U0TXBUF);
    
!   inline async event void SIGNAL_UART0RX_VECTOR.fired() {
      uint8_t temp = U0RXBUF;
      signal Interrupts.rxDone(temp);
    }
    
!   inline async event void SIGNAL_UART0TX_VECTOR.fired() {
      if ( call HplI2C.isI2C() )
        signal I2CInterrupts.fired();
--- 94,103 ----
    MSP430REG_NORACE(U0TXBUF);
    
!   TOSH_SIGNAL(UART0RX_VECTOR) {
      uint8_t temp = U0RXBUF;
      signal Interrupts.rxDone(temp);
    }
    
!   TOSH_SIGNAL(UART0TX_VECTOR) {
      if ( call HplI2C.isI2C() )
        signal I2CInterrupts.fired();

Index: HplMsp430Usart1C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/HplMsp430Usart1C.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplMsp430Usart1C.nc	17 Apr 2008 22:38:34 -0000	1.5
--- HplMsp430Usart1C.nc	15 May 2008 23:57:13 -0000	1.6
***************
*** 86,92 ****
    HplUsartP.URXD -> GIO.URXD1;
    HplUsartP.UTXD -> GIO.UTXD1;
!   
!   components HplMsp430InterruptSigP;
!   HplUsartP.SIGNAL_UART1RX_VECTOR -> HplMsp430InterruptSigP.SIGNAL_UART1RX_VECTOR;
!   HplUsartP.SIGNAL_UART1TX_VECTOR -> HplMsp430InterruptSigP.SIGNAL_UART1TX_VECTOR;
  }
--- 86,89 ----
    HplUsartP.URXD -> GIO.URXD1;
    HplUsartP.UTXD -> GIO.UTXD1;
! 
  }

Index: HplMsp430Usart1P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/usart/HplMsp430Usart1P.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplMsp430Usart1P.nc	17 Apr 2008 22:38:34 -0000	1.5
--- HplMsp430Usart1P.nc	15 May 2008 23:57:13 -0000	1.6
***************
*** 81,86 ****
    uses interface HplMsp430GeneralIO as URXD;
    uses interface HplMsp430GeneralIO as UTXD;
-   uses interface HplMsp430InterruptSig as SIGNAL_UART1RX_VECTOR;
-   uses interface HplMsp430InterruptSig as SIGNAL_UART1TX_VECTOR;
  }
  
--- 81,84 ----
***************
*** 94,103 ****
    MSP430REG_NORACE(U1TXBUF);
  
!   inline async event void SIGNAL_UART1RX_VECTOR.fired() {
      uint8_t temp = U1RXBUF;
      signal Interrupts.rxDone(temp);
    }
  
!   inline async event void SIGNAL_UART1TX_VECTOR.fired() {
      signal Interrupts.txDone();
    }
--- 92,103 ----
    MSP430REG_NORACE(U1TXBUF);
  
! 
! 
!   TOSH_SIGNAL(UART1RX_VECTOR) {
      uint8_t temp = U1RXBUF;
      signal Interrupts.rxDone(temp);
    }
  
!   TOSH_SIGNAL(UART1TX_VECTOR) {
      signal Interrupts.txDone();
    }