[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX RadioDataLinkC.nc, 1.7, 1.8

[akoepke]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18150

Modified Files:
	RadioDataLinkC.nc 
Log Message:
choose MAC using compile definitions


Index: RadioDataLinkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/RadioDataLinkC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RadioDataLinkC.nc	6 Dec 2007 18:32:11 -0000	1.7
--- RadioDataLinkC.nc	8 Jul 2008 14:32:07 -0000	1.8
***************
*** 50,58 ****
          //Change components below as desired
          Tda5250RadioC as Radio,                  //The actual Tda5250 radio over which data is receives/transmitted
          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
          LinkLayerC as Llc;                       //The Link Layer Control module to use
      
--- 50,66 ----
          //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
! #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
      
***************
*** 88,92 ****
      
      UartPhy.RadioByteComm -> Radio.RadioByteComm;
! 
      components SmclkManagerC;
  }
--- 96,101 ----
      
      UartPhy.RadioByteComm -> Radio.RadioByteComm;
! #ifndef RADIO_UART_VCO
      components SmclkManagerC;
+ #endif
  }