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 7cf98717b77d515284845d6171a43a7788d865fb..af6e1566643990ea7b11352ba038887c9b178c4b 100644 (file)
--- a/tos/lib/net/ctp/CtpP.nc
+++ b/tos/lib/net/ctp/CtpP.nc
@@ -131,7 +131,8 @@ implementation {
   components new AMReceiverC(AM_CTP_DATA);
   components new AMSnooperC(AM_CTP_DATA);
 
-  components new CtpRoutingEngineP(TREE_ROUTING_TABLE_SIZE, 10, 1024) as Router;
+  components new CtpRoutingEngineP(TREE_ROUTING_TABLE_SIZE, 128, 512000) as Router;
+
   StdControl = Router;
   StdControl = Estimator;
   RootControl = Router;
@@ -156,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;
@@ -195,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