accommodate cc1000 and cc2420 platforms by wiring to platform specific active message...

diff --git a/tos/lib/net/ctp/CtpP.nc b/tos/lib/net/ctp/CtpP.nc
index b2aa76a779dea4345b20d439fdb075706c468d3c..ef3f476914e2442fed0a2f88a7ba861dc80cd87e 100644 (file)
--- a/tos/lib/net/ctp/CtpP.nc
+++ b/tos/lib/net/ctp/CtpP.nc
@@ -152,9 +152,6 @@ implementation {
   Router.CtpCongestion -> Forwarder;
   CtpInfo = Router;
 
-  components CC2420ActiveMessageC;
-  components CC2420PacketC as CC2420;
-  Router.CC2420Packet -> CC2420;
   
   components new TimerMilliC() as RetxmitTimer;
   Forwarder.RetxmitTimer -> RetxmitTimer;
@@ -189,7 +186,19 @@ implementation {
   Estimator.SubReceive -> ReceiveControl;
   Estimator.SubPacket -> SendControl;
   Estimator.SubAMPacket -> SendControl;
-  Estimator.LinkPacketMetadata -> CC2420ActiveMessageC;
+
+#if defined(PLATFORM_TELOSB) || defined(PLATFORM_MICAZ)
+  components CC2420ActiveMessageC as PlatformActiveMessageC;
+#elif defined (PLATFORM_MICA2) || defined (PLATFORM_MICA2DOT)
+  components CC1000ActiveMessageC as PlatformActiveMessageC;
+#else
+  components DummyActiveMessageP as PlatformActiveMessageC;
+#endif
+
+  Estimator.LinkPacketMetadata -> PlatformActiveMessageC;
+
+  // eventually
   //  Estimator.LinkPacketMetadata -> ActiveMessageC;
+
   MainC.SoftwareInit -> Estimator;
 }

diff --git a/tos/lib/net/ctp/CtpRoutingEngineP.nc b/tos/lib/net/ctp/CtpRoutingEngineP.nc
index 6c16ed9b278f8d1a179135e002ea6c16d075cb68..a2d935f8cfbbb8455511fc78a0b162e86508befb 100644 (file)
--- a/tos/lib/net/ctp/CtpRoutingEngineP.nc
+++ b/tos/lib/net/ctp/CtpRoutingEngineP.nc
@@ -115,7 +115,6 @@ generic module CtpRoutingEngineP(uint8_t routingTableSize, uint16_t minInterval,
         interface CtpCongestion;
 
        interface CompareBit;
-       interface CC2420Packet;
 
     }
 }

diff --git a/tos/lib/net/ctp/DummyActiveMessageP.nc b/tos/lib/net/ctp/DummyActiveMessageP.nc
new file mode 100644 (file)
index 0000000..e4cc0f9
--- /dev/null
+++ b/tos/lib/net/ctp/DummyActiveMessageP.nc
@@ -0,0 +1,12 @@
+module DummyActiveMessageP {
+  provides interface LinkPacketMetadata;
+}
+
+implementation
+{
+
+  async command bool LinkPacketMetadata.highChannelQuality(message_t* msg) {
+    return 1;
+  }
+
+}