[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/dma HplMsp430DmaC.nc, 1.5, 1.6 HplMsp430DmaP.nc, 1.6, 1.7

[Kevin Klues]

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

Modified Files:
	HplMsp430DmaC.nc HplMsp430DmaP.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: HplMsp430DmaC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/dma/HplMsp430DmaC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HplMsp430DmaC.nc	17 Apr 2008 22:38:34 -0000	1.5
--- HplMsp430DmaC.nc	15 May 2008 23:57:13 -0000	1.6
***************
*** 86,92 ****
    Dma1.Interrupt -> HplMsp430DmaP;
    Dma2.Interrupt -> HplMsp430DmaP;
-   
-   components HplMsp430InterruptSigP;
-   HplMsp430DmaP.SIGNAL_DACDMA_VECTOR -> HplMsp430InterruptSigP.SIGNAL_DACDMA_VECTOR;
  
  }
--- 86,89 ----

Index: HplMsp430DmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/dma/HplMsp430DmaP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HplMsp430DmaP.nc	21 Apr 2008 18:52:53 -0000	1.6
--- HplMsp430DmaP.nc	15 May 2008 23:57:13 -0000	1.7
***************
*** 62,66 ****
    provides interface HplMsp430DmaControl as DmaControl;
    provides interface HplMsp430DmaInterrupt as Interrupt;
!   uses interface HplMsp430InterruptSig as SIGNAL_DACDMA_VECTOR;
  }
  
--- 62,66 ----
    provides interface HplMsp430DmaControl as DmaControl;
    provides interface HplMsp430DmaInterrupt as Interrupt;
! 
  }
  
***************
*** 70,74 ****
    MSP430REG_NORACE( DMACTL1 );
  
!   inline async event void SIGNAL_DACDMA_VECTOR.fired() {
      signal Interrupt.fired();
    }
--- 70,74 ----
    MSP430REG_NORACE( DMACTL1 );
  
!   TOSH_SIGNAL( DACDMA_VECTOR ) {
      signal Interrupt.fired();
    }