[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer Msp430TimerC.nc, 1.3, 1.4 Msp430TimerCommonP.nc, 1.3, 1.4

[Kevin Klues]

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

Modified Files:
	Msp430TimerC.nc Msp430TimerCommonP.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: Msp430TimerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Msp430TimerC.nc	17 Apr 2008 22:38:34 -0000	1.3
--- Msp430TimerC.nc	15 May 2008 23:57:13 -0000	1.4
***************
*** 160,169 ****
    Msp430TimerB6.Timer -> Msp430TimerB.Timer;
    Msp430TimerB6.Event -> Msp430TimerB.Event[6];
-   
-   components HplMsp430InterruptSigP;
-   Common.SIGNAL_TIMERA0_VECTOR -> HplMsp430InterruptSigP.SIGNAL_TIMERA0_VECTOR;
-   Common.SIGNAL_TIMERA1_VECTOR -> HplMsp430InterruptSigP.SIGNAL_TIMERA1_VECTOR;
-   Common.SIGNAL_TIMERB0_VECTOR -> HplMsp430InterruptSigP.SIGNAL_TIMERB0_VECTOR;
-   Common.SIGNAL_TIMERB1_VECTOR -> HplMsp430InterruptSigP.SIGNAL_TIMERB1_VECTOR;
  }
  
--- 160,163 ----

Index: Msp430TimerCommonP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430TimerCommonP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Msp430TimerCommonP.nc	17 Apr 2008 22:38:34 -0000	1.3
--- Msp430TimerCommonP.nc	15 May 2008 23:57:13 -0000	1.4
***************
*** 1,27 ****
  
- /* "Copyright (c) 2000-2003 The Regents of the University of California.
-  * All rights reserved.
-  *
-  * Permission to use, copy, modify, and distribute this software and its
-  * documentation for any purpose, without fee, and without written agreement
-  * is hereby granted, provided that the above copyright notice, the following
-  * two paragraphs and the author appear in all copies of this software.
-  *
-  * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
-  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
-  * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY
-  * OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
-  * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
-  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
-  * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
-  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
-  */
-  
- /**
-  * @author Cory Sharp <cssharp at eecs.berkeley.edu>
-  */
-  
  module Msp430TimerCommonP
  {
--- 1,3 ----
***************
*** 30,44 ****
    provides interface Msp430TimerEvent as VectorTimerB0;
    provides interface Msp430TimerEvent as VectorTimerB1;
-   uses interface HplMsp430InterruptSig as SIGNAL_TIMERA0_VECTOR;
-   uses interface HplMsp430InterruptSig as SIGNAL_TIMERA1_VECTOR;
-   uses interface HplMsp430InterruptSig as SIGNAL_TIMERB0_VECTOR;
-   uses interface HplMsp430InterruptSig as SIGNAL_TIMERB1_VECTOR;
  }
  implementation
  {
!   inline async event void SIGNAL_TIMERA0_VECTOR.fired() { signal VectorTimerA0.fired(); }
!   inline async event void SIGNAL_TIMERA1_VECTOR.fired() { signal VectorTimerA1.fired(); }
!   inline async event void SIGNAL_TIMERB0_VECTOR.fired() { signal VectorTimerB0.fired(); }
!   inline async event void SIGNAL_TIMERB1_VECTOR.fired() { signal VectorTimerB1.fired(); }
  }
  
--- 6,16 ----
    provides interface Msp430TimerEvent as VectorTimerB0;
    provides interface Msp430TimerEvent as VectorTimerB1;
  }
  implementation
  {
!   TOSH_SIGNAL(TIMERA0_VECTOR) { signal VectorTimerA0.fired(); }
!   TOSH_SIGNAL(TIMERA1_VECTOR) { signal VectorTimerA1.fired(); }
!   TOSH_SIGNAL(TIMERB0_VECTOR) { signal VectorTimerB0.fired(); }
!   TOSH_SIGNAL(TIMERB1_VECTOR) { signal VectorTimerB1.fired(); }
  }