[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/pins HplMsp430InterruptC.nc, 1.3, 1.4 HplMsp430InterruptNMIC.nc, 1.3, 1.4 HplMsp430InterruptNMIP.nc, 1.4, 1.5 HplMsp430InterruptP.nc, 1.3, 1.4

[Kevin Klues]

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

Modified Files:
	HplMsp430InterruptC.nc HplMsp430InterruptNMIC.nc 
	HplMsp430InterruptNMIP.nc HplMsp430InterruptP.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: HplMsp430InterruptC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins/HplMsp430InterruptC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HplMsp430InterruptC.nc	17 Apr 2008 22:38:34 -0000	1.3
--- HplMsp430InterruptC.nc	15 May 2008 23:57:13 -0000	1.4
***************
*** 52,56 ****
  {
    components HplMsp430InterruptP as HplInterruptP;
-   components HplMsp430InterruptSigP;
  #ifdef __msp430_have_port1
    Port10 = HplInterruptP.Port10;
--- 52,55 ----
***************
*** 62,66 ****
    Port16 = HplInterruptP.Port16;
    Port17 = HplInterruptP.Port17;
-   HplInterruptP.SIGNAL_PORT1_VECTOR -> HplMsp430InterruptSigP.SIGNAL_PORT1_VECTOR;
  #endif
  #ifdef __msp430_have_port2
--- 61,64 ----
***************
*** 73,77 ****
    Port26 = HplInterruptP.Port26;
    Port27 = HplInterruptP.Port27;
-   HplInterruptP.SIGNAL_PORT2_VECTOR -> HplMsp430InterruptSigP.SIGNAL_PORT2_VECTOR;
  #endif
  }
--- 71,74 ----

Index: HplMsp430InterruptNMIC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins/HplMsp430InterruptNMIC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HplMsp430InterruptNMIC.nc	17 Apr 2008 22:38:34 -0000	1.3
--- HplMsp430InterruptNMIC.nc	15 May 2008 23:57:13 -0000	1.4
***************
*** 39,44 ****
    OF = HplInterruptP.OF;
    ACCV = HplInterruptP.ACCV;
-   
-   components HplMsp430InterruptSigP;
-   HplInterruptP.SIGNAL_NMI_VECTOR -> HplMsp430InterruptSigP.SIGNAL_NMI_VECTOR;
  }
--- 39,41 ----

Index: HplMsp430InterruptNMIP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins/HplMsp430InterruptNMIP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HplMsp430InterruptNMIP.nc	17 Apr 2008 22:38:34 -0000	1.4
--- HplMsp430InterruptNMIP.nc	15 May 2008 23:57:13 -0000	1.5
***************
*** 28,36 ****
    provides interface HplMsp430Interrupt as OF;
    provides interface HplMsp430Interrupt as ACCV;
-   uses interface HplMsp430InterruptSig as SIGNAL_NMI_VECTOR;
  }
  implementation
  {
!   inline async event void SIGNAL_NMI_VECTOR.fired() 
    {
      volatile int n = IFG1;
--- 28,35 ----
    provides interface HplMsp430Interrupt as OF;
    provides interface HplMsp430Interrupt as ACCV;
  }
  implementation
  {
!   TOSH_SIGNAL(NMI_VECTOR)
    {
      volatile int n = IFG1;

Index: HplMsp430InterruptP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/pins/HplMsp430InterruptP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HplMsp430InterruptP.nc	17 Apr 2008 22:38:34 -0000	1.3
--- HplMsp430InterruptP.nc	15 May 2008 23:57:13 -0000	1.4
***************
*** 34,38 ****
    provides interface HplMsp430Interrupt as Port16;
    provides interface HplMsp430Interrupt as Port17;
-   uses interface HplMsp430InterruptSig as SIGNAL_PORT1_VECTOR;
  #endif
  #ifdef __msp430_have_port2
--- 34,37 ----
***************
*** 45,49 ****
    provides interface HplMsp430Interrupt as Port26;
    provides interface HplMsp430Interrupt as Port27;
-   uses interface HplMsp430InterruptSig as SIGNAL_PORT2_VECTOR;
  #endif
  
--- 44,47 ----
***************
*** 53,57 ****
  
  #ifdef __msp430_have_port1
!   inline async event void SIGNAL_PORT1_VECTOR.fired()
    {
      volatile int n = P1IFG & P1IE;
--- 51,55 ----
  
  #ifdef __msp430_have_port1
!   TOSH_SIGNAL(PORT1_VECTOR)
    {
      volatile int n = P1IFG & P1IE;
***************
*** 158,162 ****
  
  #ifdef __msp430_have_port2
!   inline async event void SIGNAL_PORT2_VECTOR.fired()
    {
      volatile int n = P2IFG & P2IE;
--- 156,160 ----
  
  #ifdef __msp430_have_port2
!   TOSH_SIGNAL(PORT2_VECTOR)
    {
      volatile int n = P2IFG & P2IE;