[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc1000 CC1000CsmaRadioC.nc, 1.7, 1.8

[Jan Beutel]

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

Modified Files:
	CC1000CsmaRadioC.nc 
Log Message:
reverted devdj commit that broke building for mica2dot

Index: CC1000CsmaRadioC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000CsmaRadioC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CC1000CsmaRadioC.nc	19 Aug 2008 10:28:02 -0000	1.7
--- CC1000CsmaRadioC.nc	1 Sep 2008 08:28:59 -0000	1.8
***************
*** 1,3 ****
! /*
   * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
--- 1,3 ----
! /* $Id$
   * "Copyright (c) 2000-2005 The Regents of the University  of California.  
   * All rights reserved.
***************
*** 45,49 ****
   * @author Joe Polastre
   * @author David Gay
-  * @author Marco Langerwisch (Packet timestamping)
   */
  
--- 45,48 ----
***************
*** 57,71 ****
      interface Receive;
  
!     interface Packet;
      interface CsmaControl;
      interface CsmaBackoff;
      interface PacketAcknowledgements;
      interface LinkPacketMetadata;
! 
      interface LowPowerListening;
- 
-     interface PacketTimeStamp<T32khz, uint32_t> as PacketTimeStamp32khz;
-     interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
-     interface PacketTimeSyncOffset;
    }
  }
--- 56,67 ----
      interface Receive;
  
!     interface Packet;    
      interface CsmaControl;
      interface CsmaBackoff;
+     interface RadioTimeStamping;
      interface PacketAcknowledgements;
      interface LinkPacketMetadata;
!     
      interface LowPowerListening;
    }
  }
***************
*** 91,97 ****
    CsmaBackoff = Csma;
    LowPowerListening = Csma;
    PacketAcknowledgements = SendReceive;
    LinkPacketMetadata = SendReceive;
! 
    Csma.CC1000Control -> Control;
    Csma.Random -> RandomC;
--- 87,94 ----
    CsmaBackoff = Csma;
    LowPowerListening = Csma;
+   RadioTimeStamping = SendReceive;
    PacketAcknowledgements = SendReceive;
    LinkPacketMetadata = SendReceive;
!   
    Csma.CC1000Control -> Control;
    Csma.Random -> RandomC;
***************
*** 107,111 ****
    SendReceive.RssiRx -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
    SendReceive.CC1000Squelch -> Squelch;
! 
    Csma.RssiNoiseFloor -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
    Csma.RssiCheckChannel -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
--- 104,108 ----
    SendReceive.RssiRx -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
    SendReceive.CC1000Squelch -> Squelch;
!   
    Csma.RssiNoiseFloor -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
    Csma.RssiCheckChannel -> Rssi.Rssi[unique(UQ_CC1000_RSSI)];
***************
*** 118,132 ****
    Control.CC -> Hpl;
    Control.BusyWait -> BusyWaitMicroC;
- 
-   PacketTimeStamp32khz = SendReceive;
-   PacketTimeStampMilli = SendReceive;
-   PacketTimeSyncOffset = SendReceive;
- 
-   components Counter32khz32C, new CounterToLocalTimeC(T32khz);
-   CounterToLocalTimeC.Counter -> Counter32khz32C;
-   SendReceive.LocalTime32khz -> CounterToLocalTimeC;
- 
-   //DummyTimer is introduced to compile apps that use no timers
-   components HilTimerMilliC, new TimerMilliC() as DummyTimer;
-   SendReceive.LocalTimeMilli -> HilTimerMilliC;
  }
--- 115,117 ----