Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / net / ctp / CtpP.nc

diff --git a/tos/lib/net/ctp/CtpP.nc b/tos/lib/net/ctp/CtpP.nc
index 79e6aeccb9aa45472decfd72523a812c16fc1124..af6e1566643990ea7b11352ba038887c9b178c4b 100644 (file)
--- a/tos/lib/net/ctp/CtpP.nc
+++ b/tos/lib/net/ctp/CtpP.nc
@@ -157,9 +157,6 @@ implementation {
   components new TimerMilliC() as RetxmitTimer;
   Forwarder.RetxmitTimer -> RetxmitTimer;
 
-  components new TimerMilliC() as CongestionTimer;
-  Forwarder.CongestionTimer -> CongestionTimer;
-
   components RandomC;
   Router.Random -> RandomC;
   Forwarder.Random -> RandomC;
@@ -196,6 +193,8 @@ implementation {
 #endif
 #elif defined (PLATFORM_MICA2) || defined (PLATFORM_MICA2DOT)
   components CC1000ActiveMessageC as PlatformActiveMessageC;
+#elif defined(PLATFORM_EYESIFXV1) || defined(PLATFORM_EYESIFXV2)
+  components WhiteBitAccessorC as PlatformActiveMessageC;    
 #else
   components DummyActiveMessageP as PlatformActiveMessageC;
 #endif