commit svn HEAD of blip into core to start merge testing

[tinyos-2.x.git] / apps / IPBaseStation / BaseStationC.nc

diff --git a/apps/IPBaseStation/BaseStationC.nc b/apps/IPBaseStation/BaseStationC.nc
index 6114950d8c65d4d4e723f1abd0596f0fc592f9a7..aa36022ef6eeec6d9ea6fdad5ae693090665e5ae 100644 (file)
--- a/apps/IPBaseStation/BaseStationC.nc
+++ b/apps/IPBaseStation/BaseStationC.nc
@@ -89,40 +89,22 @@ configuration BaseStationC {
 }
 implementation {
   components MainC, BaseStationP, LedsC;
-#ifndef SIM
-  components CC2420ActiveMessageC as Radio;
+  components Ieee154MessageC as Radio;
   components SerialDispatcherC as SerialControl, Serial802_15_4C as Serial;
-#else 
-  components ActiveMessageC as Radio;
-  components SerialActiveMessageC as Serial;
-#endif
   
   MainC.Boot <- BaseStationP;
 
   BaseStationP.RadioControl -> Radio;
-#ifndef SIM
   BaseStationP.SerialControl -> SerialControl;
   BaseStationP.UartSend -> Serial.Send;
   BaseStationP.UartReceive -> Serial.Receive;
-#else
-  BaseStationP.SerialControl -> Serial;
-  BaseStationP.UartSend -> Serial.AMSend[0];
-  BaseStationP.UartReceive -> Serial.Receive[0];
-#endif
   
 
-#ifndef SIM  
   BaseStationP.RadioSend -> Radio;
-  BaseStationP.RadioReceive -> Radio.IEEE154Receive;
-#else
-  BaseStationP.RadioSend -> Radio.AMSend[0];
-  BaseStationP.RadioReceive -> Radio.ReceiveBase[0];
-  BaseStationP.SerialAMPacket -> Serial;
-  BaseStationP.SerialPacket -> Serial;
-#endif
+  BaseStationP.RadioReceive -> Radio.Ieee154Receive;
 
-  BaseStationP.RadioPacket -> Radio.SubAMPacket;
-  BaseStationP.RadioIEEEPacket -> Radio;
+  BaseStationP.RadioPacket -> Radio.Packet;
+  BaseStationP.RadioIeeePacket -> Radio;
   
   BaseStationP.Leds -> LedsC;
 
@@ -132,7 +114,6 @@ implementation {
   components ResetC;
   BaseStationP.Reset -> ResetC;
 
-#ifndef SIM
   components SerialDevConfC as Configure;
   BaseStationP.ConfigureSend -> Configure;
   BaseStationP.ConfigureReceive -> Configure;
@@ -145,5 +126,4 @@ implementation {
 
   components CC2420ControlC;
   BaseStationP.CC2420Config -> CC2420ControlC;
-#endif
 }