[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer HilTimerMilliC.nc, 1.1.2.2, 1.1.2.3 Msp430Counter32khzC.nc, 1.1.2.3, 1.1.2.4 Msp430Timer32khzMapC.nc, 1.1.2.2, 1.1.2.3

[Cory Sharp]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HilTimerMilliC.nc Msp430Counter32khzC.nc 
	Msp430Timer32khzMapC.nc 
Log Message:
* Make TEP 102 reflect reality: a component MUST provide HilTimerMilliC not
TimerMilliC

* Make reality reflect TEP 102: apply the Alarm${P}{W}C and Counter${P}${W}C
naming convention to the MSP430 platform and the components it touches.

* The pxa27x still needs to be updated, and as such, I did not update
tos/lib/gpio/SoftCapture.  I leave that to (I assume) Phil B.



Index: HilTimerMilliC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/HilTimerMilliC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HilTimerMilliC.nc	19 Jun 2006 11:12:23 -0000	1.1.2.2
--- HilTimerMilliC.nc	18 Oct 2006 22:02:25 -0000	1.1.2.3
***************
*** 21,30 ****
  
  /**
!  * TimerMilliC is the TinyOS TimerMilli component.  OSKI will expect
!  * TimerMilliC to exist.  It's in the platform directory so that the platform
!  * can directly manage how it chooses to implement the timer.  It is fully
!  * expected that the standard TinyOS MultiplexTimerM component will be used for
!  * all platforms, and that this configuration only specifies (implicitly or
!  * explicitly) how precisely to use the hardware resources.
   *
   * @author Cory Sharp <cssharp at eecs.berkeley.edu>
--- 21,27 ----
  
  /**
!  * HilTimerMilliC provides a parameterized interface to a virtualized
!  * millisecond timer.  TimerMilliC in tos/system/ uses this component to
!  * allocate new timers.
   *
   * @author Cory Sharp <cssharp at eecs.berkeley.edu>
***************
*** 33,38 ****
   */
  
- #include "Timer.h"
- 
  configuration HilTimerMilliC
  {
--- 30,33 ----
***************
*** 42,52 ****
  implementation
  {
!   components new AlarmMilliC(), new AlarmToTimerC(TMilli),
!              new VirtualizeTimerC(TMilli,uniqueCount(UQ_TIMER_MILLI));
  
!   Init = AlarmMilliC;
    TimerMilli = VirtualizeTimerC;
  
    VirtualizeTimerC.TimerFrom -> AlarmToTimerC;
!   AlarmToTimerC.Alarm -> AlarmMilliC;
  }
--- 37,48 ----
  implementation
  {
!   components new AlarmMilli32C();
!   components new AlarmToTimerC(TMilli);
!   components new VirtualizeTimerC(TMilli,uniqueCount(UQ_TIMER_MILLI));
  
!   Init = AlarmMilli32C;
    TimerMilli = VirtualizeTimerC;
  
    VirtualizeTimerC.TimerFrom -> AlarmToTimerC;
!   AlarmToTimerC.Alarm -> AlarmMilli32C;
  }

Index: Msp430Counter32khzC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430Counter32khzC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Msp430Counter32khzC.nc	19 Jun 2006 11:12:24 -0000	1.1.2.3
--- Msp430Counter32khzC.nc	18 Oct 2006 22:02:25 -0000	1.1.2.4
***************
*** 28,33 ****
   */
  
- #include "Timer.h"
- 
  configuration Msp430Counter32khzC
  {
--- 28,31 ----
***************
*** 36,42 ****
  implementation
  {
!   components Msp430TimerC
!            , new Msp430CounterC(T32khz) as Counter
!            ;
  
    Msp430Counter32khz = Counter;
--- 34,39 ----
  implementation
  {
!   components Msp430TimerC;
!   components new Msp430CounterC(T32khz) as Counter;
  
    Msp430Counter32khz = Counter;

Index: Msp430Timer32khzMapC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430Timer32khzMapC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Msp430Timer32khzMapC.nc	19 Jun 2006 11:12:24 -0000	1.1.2.2
--- Msp430Timer32khzMapC.nc	18 Oct 2006 22:02:25 -0000	1.1.2.3
***************
*** 24,28 ****
   * Msp430Timer32khzMapC presents as paramaterized interfaces all of the 32khz
   * hardware timers on the MSP430 that are available for compile time allocation
!  * by "new Alarm32khzC()", "new AlarmMilliC()", and so on.
   *
   * Platforms based on the MSP430 are encouraged to copy in and override this
--- 24,28 ----
   * Msp430Timer32khzMapC presents as paramaterized interfaces all of the 32khz
   * hardware timers on the MSP430 that are available for compile time allocation
!  * by "new Alarm32khz16C()", "new AlarmMilli32C()", and so on.
   *
   * Platforms based on the MSP430 are encouraged to copy in and override this