[Tinyos-2-commits] CVS: tinyos-2.x/doc/txt tep102.txt, 1.1.2.8, 1.1.2.9

Cory Sharp cssharp at users.sourceforge.net
Wed Oct 18 15:02:27 PDT 2006


Update of /cvsroot/tinyos/tinyos-2.x/doc/txt
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11477/doc/txt

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	tep102.txt 
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: tep102.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/doc/txt/tep102.txt,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** tep102.txt	18 Oct 2006 17:51:30 -0000	1.1.2.8
--- tep102.txt	18 Oct 2006 22:02:25 -0000	1.1.2.9
***************
*** 361,370 ****
    }
  
!   generic configuration Alarm${P}${W}C
    {
      provides interface Alarm< T${P}, uint${W}_t >;
    }
  
! Instantiating a Alarm${P}${W}C component provides a new and
  independent Alarm.  If the platform presents a limited number of
  Alarm resources, then allocating more Alarms in an application than
--- 361,370 ----
    }
  
!   generic configuration Alarm${P}${W}C()
    {
      provides interface Alarm< T${P}, uint${W}_t >;
    }
  
! Instantiating an Alarm${P}${W}C component provides a new and
  independent Alarm.  If the platform presents a limited number of
  Alarm resources, then allocating more Alarms in an application than
***************
*** 382,386 ****
    }
  
!   generic configuration Alarm32khz8C
    {
      provides interface Alarm< T32khz, uint8_t >;
--- 382,386 ----
    }
  
!   generic configuration Alarm32khz8C()
    {
      provides interface Alarm< T32khz, uint8_t >;
***************
*** 392,412 ****
  together.
  
  4. HIL requirements
  ====================================================================
  
  The following component MUST be provided on all platforms::
!   TimerMilliC
    BusyWaitMicroC
  
! TimerMilliC
  --------------------------------------------------------------------
  
  ::
  
!   configuration TimerMilliC
    {
      provides interface Init;
!     provides interface Timer<TMilli>[uint8_t num];
!     provides interface LocalTime<TMilli>;
    }
  
--- 392,412 ----
  together.
  
+ 
  4. HIL requirements
  ====================================================================
  
  The following component MUST be provided on all platforms::
!   HilTimerMilliC
    BusyWaitMicroC
  
! HilTimerMilliC
  --------------------------------------------------------------------
  
  ::
  
!   configuration HilTimerMilliC
    {
      provides interface Init;
!     provides interface Timer<TMilli> as TimerMilli[ uint8_t num ];
    }
  
***************
*** 414,418 ****
  new unique timer number.  This timer number is used to index the
  TimerMilli parameterised interface.  UQ_TIMER_MILLI is defined in
! Timer.h.
  
  BusyWaitMicroC
--- 414,419 ----
  new unique timer number.  This timer number is used to index the
  TimerMilli parameterised interface.  UQ_TIMER_MILLI is defined in
! Timer.h.  HilTimerMilliC is used by the generic component
! TimerMilliC found in ``tos/system/``.
  
  BusyWaitMicroC
***************
*** 595,606 ****
  ``tinyos-2.x/tos/chips/msp430/timer``:
  
!   * ``Alarm32khzC.nc`` is generic and provides a new ``Alarm<T32khz,uint16_t>``
!     and ``Alarm<T32khz,uint32_t>``
!   * ``AlarmMilliC.nc`` is generic and provides a new ``Alarm<TMilli,uint32_t>``
    * ``BusyWait32khzC.nc`` provides ``BusyWait<T32khz,uint16_t>``
    * ``BusyWaitMicroC.nc`` provides ``BusyWait<TMicro,uint16_t>``
!   * ``Counter32khzC.nc`` provides ``Counter<T32khz,uint16_t>``,
!     ``Counter<T32khz,uint32_t>``, and ``LocalTime<T32khz>``
!   * ``CounterMilliC.nc`` provides ``Counter<TMilli,uint32_t>`` and ``LocalTime<TMilli>``
    * ``GpioCaptureC.nc``
    * ``HilTimerMilliC.nc`` provides ``Timer<TMilli> as TimerMilli[uint8_t num]``
--- 596,609 ----
  ``tinyos-2.x/tos/chips/msp430/timer``:
  
!   * ``Alarm32khz16C.nc`` is generic and provides a new ``Alarm<T32khz,uint16_t>``
!   * ``Alarm32khz32C.nc`` is generic and provides a new ``Alarm<T32khz,uint32_t>``
!   * ``AlarmMilli16C.nc`` is generic and provides a new ``Alarm<TMilli,uint16_t>``
!   * ``AlarmMilli32C.nc`` is generic and provides a new ``Alarm<TMilli,uint32_t>``
    * ``BusyWait32khzC.nc`` provides ``BusyWait<T32khz,uint16_t>``
    * ``BusyWaitMicroC.nc`` provides ``BusyWait<TMicro,uint16_t>``
!   * ``Counter32khz16C.nc`` provides ``Counter<T32khz,uint16_t>``
!   * ``Counter32khz32C.nc`` provides ``Counter<T32khz,uint32_t>``
!   * ``CounterMilli16C.nc`` provides ``Counter<TMilli,uint16_t>``
!   * ``CounterMilli32C.nc`` provides ``Counter<TMilli,uint32_t>``
    * ``GpioCaptureC.nc``
    * ``HilTimerMilliC.nc`` provides ``Timer<TMilli> as TimerMilli[uint8_t num]``



More information about the Tinyos-2-commits mailing list