uff -- resolved hardware race conditions (hopefully)

[tinyos-2.x.git] / tos / platforms / eyesIFX / RadioDataLinkC.nc

diff --git a/tos/platforms/eyesIFX/RadioDataLinkC.nc b/tos/platforms/eyesIFX/RadioDataLinkC.nc
index 63f0feb38c13d574b937e6201e7a964665a7e8c8..dd90bfc2792f3cab9d467466eb25cf8be35d1484 100644 (file)
--- a/tos/platforms/eyesIFX/RadioDataLinkC.nc
+++ b/tos/platforms/eyesIFX/RadioDataLinkC.nc
@@ -49,10 +49,11 @@ 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
+        Uart4b6bPhyC as UartPhy,                 //The UartPhy turns Bits into Bytes
         PacketSerializerP  as PacketSerializer,  //The PacketSerializer turns Bytes into Packets
+        // RedMacC as Mac,                         //The MAC protocol to use
+        // SpeckMacDC as Mac,                         //The MAC protocol to use
         CsmaMacC as Mac,                         //The MAC protocol to use
-        //SyncSampleMacC as Mac,
         LinkLayerC as Llc;                       //The Link Layer Control module to use
     
     //Don't change wirings below this point, just change which components
@@ -68,20 +69,24 @@ 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;
+
+    components SmclkManagerC;
 }