X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2FeyesIFX%2FRadioDataLinkC.nc;h=aa50a5ceec79760cf54e23484c9f2f781c36920c;hb=429afe050091900247e4cc4ca891bb6be6ba9ce1;hp=63f0feb38c13d574b937e6201e7a964665a7e8c8;hpb=1ba974b83d19fc41bf80acd52726f36f7f1df297;p=tinyos-2.x.git

diff --git a/tos/platforms/eyesIFX/RadioDataLinkC.nc b/tos/platforms/eyesIFX/RadioDataLinkC.nc
index 63f0feb3..aa50a5ce 100644
--- a/tos/platforms/eyesIFX/RadioDataLinkC.nc
+++ b/tos/platforms/eyesIFX/RadioDataLinkC.nc
@@ -49,18 +49,24 @@ implementation
     components 
         //Change components below as desired
         Tda5250RadioC as Radio,                  //The actual Tda5250 radio over which data is receives/transmitted
-        UartPhyC as UartPhy,                     //The UartPhy turns Bits into Bytes
+#ifdef PHY_MANCHESTER
+        UartManchPhyC as UartPhy,
+#else
+        Uart4b6bPhyC as UartPhy,                 //The UartPhy turns Bits into Bytes
+#endif
         PacketSerializerP  as PacketSerializer,  //The PacketSerializer turns Bytes into Packets
+#ifdef MAC_REDMAC
+        RedMacC as Mac,                         //The MAC protocol to use
+#elif  defined(MAC_SPECKMACD)   
+        SpeckMacDC as Mac,                         //The MAC protocol to use
+#else
         CsmaMacC as Mac,                         //The MAC protocol to use
-        //SyncSampleMacC as Mac,
+#endif
         LinkLayerC as Llc;                       //The Link Layer Control module to use
     
     //Don't change wirings below this point, just change which components
-    //They are compposed of in the list above             
+    //They are compposed of in the list above
     
-    components MainC;
-    MainC.SoftwareInit -> PacketSerializer;
-            
     SplitControl = Llc;
     Llc.MacSplitControl -> Mac.SplitControl;
     Llc.RadioSplitControl -> Radio.SplitControl;
@@ -68,20 +74,32 @@ implementation
     Send = Llc.Send;
     Receive = Llc.Receive;
     PacketAcknowledgements = Llc;
-    Packet = PacketSerializer;
+    Packet = Mac;
   
     Llc.SendDown->Mac.MacSend;
     Llc.ReceiveLower->Mac.MacReceive;
-    Llc.Packet->PacketSerializer.Packet;
+    Llc.Packet->Mac.Packet;
+    Mac.SubPacket->PacketSerializer.Packet;
     
     Mac.PacketSend->PacketSerializer.PhySend;
     Mac.PacketReceive->PacketSerializer.PhyReceive;  
     Mac.Tda5250Control->Radio;
     Mac.UartPhyControl -> UartPhy;
-    
+
+    Mac.RadioTimeStamping -> PacketSerializer.RadioTimeStamping;
     PacketSerializer.RadioByteComm -> UartPhy.SerializerRadioByteComm;
     PacketSerializer.PhyPacketTx -> UartPhy.PhyPacketTx;
     PacketSerializer.PhyPacketRx -> UartPhy.PhyPacketRx;
     
     UartPhy.RadioByteComm -> Radio.RadioByteComm;
+
+#ifndef RADIO_UART_VCO
+    components SmclkManagerC;
+#endif
+
+#ifdef PACKETSERIALIZER_DEBUG
+    components new SerialDebugC() as SD;
+    PacketSerializer.SerialDebug -> SD;
+#endif
+
 }