[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac CsmaMacC.nc, 1.1.2.5, 1.1.2.6 CsmaMacP.nc, 1.1.2.5, 1.1.2.6 CsmaMacAckC.nc, 1.1.2.1, NONE CsmaMacAckP.nc, 1.1.2.1, NONE

[Philipp Huppertz]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11812/tos/chips/tda5250/mac

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacC.nc CsmaMacP.nc 
Removed Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacAckC.nc CsmaMacAckP.nc 
Log Message:
- should compile again...


Index: CsmaMacC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/Attic/CsmaMacC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** CsmaMacC.nc	31 May 2006 16:32:42 -0000	1.1.2.5
--- CsmaMacC.nc	7 Jun 2006 19:54:53 -0000	1.1.2.6
***************
*** 1,3 ****
! /* 
   * Copyright (c) 2006, Technische Universitaet Berlin
   * All rights reserved.
--- 1,3 ----
! /* -*- mode:c++; indent-tabs-mode:nil -*- 
   * Copyright (c) 2006, Technische Universitaet Berlin
   * All rights reserved.
***************
*** 53,62 ****
  implementation {
    components  MainC,
!               CsmaMacP,
!               RssiFixedThresholdCMC as Cca,
!               new Alarm32khzC() as MinClearTimer,
!               new TimerMilliC() as BackoffTimer,
!               RandomLfsrC;
! 
      MainC.SoftwareInit -> CsmaMacP;
                
--- 53,62 ----
  implementation {
    components  MainC,
!       CsmaMacP,
!       RssiFixedThresholdCMC as Cca,
!       new Alarm32khzC() as Timer,
!       RandomLfsrC,
!       PlatformLedsC;
!               
      MainC.SoftwareInit -> CsmaMacP;
                
***************
*** 77,82 ****
      CsmaMacP.Random -> RandomLfsrC;
  
!     CsmaMacP.MinClearTimer -> MinClearTimer;    
!     CsmaMacP.BackoffTimer -> BackoffTimer;    
  }
  
--- 77,85 ----
      CsmaMacP.Random -> RandomLfsrC;
  
!     CsmaMacP.Timer -> Timer;
!     CsmaMacP.Led0 -> PlatformLedsC.Led0;
!     CsmaMacP.Led1 -> PlatformLedsC.Led1;
!     CsmaMacP.Led2 -> PlatformLedsC.Led2;
!     CsmaMacP.Led3 -> PlatformLedsC.Led3;
  }
  

Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/Attic/CsmaMacP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** CsmaMacP.nc	31 May 2006 16:32:42 -0000	1.1.2.5
--- CsmaMacP.nc	7 Jun 2006 19:54:53 -0000	1.1.2.6
***************
*** 1,3 ****
! /*
   * Copyright (c) 2004-2006, Technische Universitaet Berlin
   * All rights reserved.
--- 1,3 ----
! /* -*- mode:c++; indent-tabs-mode: nil -*-
   * Copyright (c) 2004-2006, Technische Universitaet Berlin
   * All rights reserved.
***************
*** 42,129 ****
  module CsmaMacP {
[...1217 lines suppressed...]
!       atomic {
!         if (macState == RX_P) rssiValue = data;
!       }
      }
  
--- 636,640 ----
      
      async event void ChannelMonitorData.getSnrDone(int16_t data) {
!         atomic if(macState == RX_P) rssiValue = data;
      }
  
***************
*** 674,679 ****
      async event void RadioModes.SelfPollingModeDone() {}
      async event void RadioModes.PWDDDInterrupt() {}
- 
-     
  }
  
--- 646,649 ----

--- CsmaMacAckC.nc DELETED ---

--- CsmaMacAckP.nc DELETED ---