From: andreaskoepke <andreaskoepke>
Date: Tue, 8 Jul 2008 14:32:07 +0000 (+0000)
Subject: choose MAC using compile definitions
X-Git-Tag: release_tinyos_2_1_0_0~101
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=7e8b2dc4c75215f91edd03b523c7b411b3744e17;p=tinyos-2.x.git

choose MAC using compile definitions
---

diff --git a/tos/platforms/eyesIFX/RadioDataLinkC.nc b/tos/platforms/eyesIFX/RadioDataLinkC.nc
index dd90bfc2..eee306f5 100644
--- a/tos/platforms/eyesIFX/RadioDataLinkC.nc
+++ b/tos/platforms/eyesIFX/RadioDataLinkC.nc
@@ -49,11 +49,19 @@ implementation
     components 
         //Change components below as desired
         Tda5250RadioC as Radio,                  //The actual Tda5250 radio over which data is receives/transmitted
+#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
-        // RedMacC as Mac,                         //The MAC protocol to use
-        // SpeckMacDC as Mac,                         //The MAC protocol to use
+#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
+#endif
         LinkLayerC as Llc;                       //The Link Layer Control module to use
     
     //Don't change wirings below this point, just change which components
@@ -87,6 +95,7 @@ implementation
     PacketSerializer.PhyPacketRx -> UartPhy.PhyPacketRx;
     
     UartPhy.RadioByteComm -> Radio.RadioByteComm;
-
+#ifndef RADIO_UART_VCO
     components SmclkManagerC;
+#endif
 }