[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica Alarm32khz32C.nc, 1.1.2.3, 1.1.2.4 Counter32khz32C.nc, 1.1.2.4, 1.1.2.5 CounterMicro32C.nc, 1.1.2.3, 1.1.2.4

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20235

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Alarm32khz32C.nc Counter32khz32C.nc CounterMicro32C.nc 
Log Message:
counters were missing the mica timer updates


Index: Alarm32khz32C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/Attic/Alarm32khz32C.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
*** Alarm32khz32C.nc	28 Apr 2006 23:18:57 -0000	1.1.2.3
--- Alarm32khz32C.nc	12 Jun 2006 19:11:01 -0000	1.1.2.4
***************
*** 31,36 ****
  {
    components new AlarmOne16C() as Alarm16, Counter32khz32C as Counter32,
!     new TransformAlarmC(T32khz, uint32_t, TOne, uint16_t, MICA_DIVIDE_ONE_FOR_32KHZ_LOG2)
!       as Transform32;
  
    Alarm = Transform32;
--- 31,36 ----
  {
    components new AlarmOne16C() as Alarm16, Counter32khz32C as Counter32,
!     new TransformAlarmC(T32khz, uint32_t, TOne, uint16_t,
! 			MICA_DIVIDE_ONE_FOR_32KHZ_LOG2) as Transform32;
  
    Alarm = Transform32;

Index: Counter32khz32C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/Attic/Counter32khz32C.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Counter32khz32C.nc	28 Apr 2006 23:27:22 -0000	1.1.2.4
--- Counter32khz32C.nc	12 Jun 2006 19:11:01 -0000	1.1.2.5
***************
*** 27,32 ****
  {
    components CounterOne16C as Counter16, 
!     new TransformCounterC(T32khz, uint32_t, T32khz, uint16_t, 0, counter_one_overflow_t)
!       as Transform32;
  
    Counter = Transform32;
--- 27,33 ----
  {
    components CounterOne16C as Counter16, 
!     new TransformCounterC(T32khz, uint32_t, T32khz, uint16_t,
! 			  MICA_DIVIDE_ONE_FOR_32KHZ_LOG2,
! 			  counter_one_overflow_t) as Transform32;
  
    Counter = Transform32;

Index: CounterMicro32C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica/Attic/CounterMicro32C.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
*** CounterMicro32C.nc	28 Apr 2006 23:18:57 -0000	1.1.2.3
--- CounterMicro32C.nc	12 Jun 2006 19:11:01 -0000	1.1.2.4
***************
*** 26,32 ****
  implementation
  {
!   components CounterMicro16C as Counter16, 
!     new TransformCounterC(TMicro, uint32_t, TMicro, uint16_t, 0, counter_three_overflow_t)
!       as Transform32;
  
    Counter = Transform32;
--- 26,33 ----
  implementation
  {
!   components CounterThree16C as Counter16, 
!     new TransformCounterC(TMicro, uint32_t, TMicro, uint16_t,
! 			  MICA_DIVIDE_THREE_FOR_MICRO_LOG2,
! 			  counter_three_overflow_t) as Transform32;
  
    Counter = Transform32;