[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/rf230 RF230ActiveMessageC.nc, 1.8, 1.9 RF230ActiveMessageP.nc, 1.8, 1.9 RF230Ieee154MessageC.nc, 1.2, 1.3

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25221/rf230

Modified Files:
	RF230ActiveMessageC.nc RF230ActiveMessageP.nc 
	RF230Ieee154MessageC.nc 
Log Message:
make traffic monitor optional

Index: RF230ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RF230ActiveMessageC.nc	9 Apr 2009 20:48:04 -0000	1.8
--- RF230ActiveMessageC.nc	10 Apr 2009 08:33:20 -0000	1.9
***************
*** 151,159 ****
  // -------- Traffic Monitor
  
  	components TrafficMonitorLayerC;
  	TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
! 	TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
! 	TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
! 	TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
  
  // -------- CollisionAvoidance
--- 151,163 ----
  // -------- Traffic Monitor
  
+ #ifdef TRAFFIC_MONITOR
  	components TrafficMonitorLayerC;
+ #else
+ 	components new DummyLayerC() as TrafficMonitorLayerC;
+ #endif
  	TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
! 	TrafficMonitorLayerC -> CollisionAvoidanceLayerC.RadioSend;
! 	TrafficMonitorLayerC -> CollisionAvoidanceLayerC.RadioReceive;
! 	TrafficMonitorLayerC -> RF230DriverLayerC.RadioState;
  
  // -------- CollisionAvoidance

Index: RF230ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RF230ActiveMessageP.nc	9 Apr 2009 20:48:04 -0000	1.8
--- RF230ActiveMessageP.nc	10 Apr 2009 08:33:20 -0000	1.9
***************
*** 126,130 ****
--- 126,132 ----
  	tasklet_async command void SoftwareAckConfig.reportChannelError()
  	{
+ #ifdef TRAFFIC_MONITOR
  		signal TrafficMonitorConfig.channelError();
+ #endif
  	}
  
***************
*** 148,152 ****
--- 150,156 ----
  	tasklet_async command void UniqueConfig.reportChannelError()
  	{
+ #ifdef TRAFFIC_MONITOR
  		signal TrafficMonitorConfig.channelError();
+ #endif
  	}
  
***************
*** 221,229 ****
  	}
  
- 	tasklet_async command void TrafficMonitorConfig.timerTick()
- 	{
- 		signal SlottedCollisionConfig.timerTick();
- 	}
- 
  /*----------------- RandomCollisionConfig -----------------*/
  
--- 225,228 ----
***************
*** 301,306 ****
  	}
  
- 	default tasklet_async event void SlottedCollisionConfig.timerTick() { }
- 
  /*----------------- Dummy -----------------*/
  
--- 300,303 ----

Index: RF230Ieee154MessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RF230Ieee154MessageC.nc	10 Apr 2009 07:46:44 -0000	1.2
--- RF230Ieee154MessageC.nc	10 Apr 2009 08:33:20 -0000	1.3
***************
*** 109,128 ****
  
  	components MessageBufferLayerC;
! 	MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
  	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
! 	MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;
  	RadioChannel = MessageBufferLayerC;
  
  // -------- UniqueLayer receive part (wired twice)
  
! 	UniqueLayerC.SubReceive -> TrafficMonitorLayerC;
! 
! // -------- Traffic Monitor
! 
! 	components TrafficMonitorLayerC;
! 	TrafficMonitorLayerC.Config -> RF230ActiveMessageP;
! 	TrafficMonitorLayerC.SubSend -> CollisionAvoidanceLayerC;
! 	TrafficMonitorLayerC.SubReceive -> CollisionAvoidanceLayerC;
! 	TrafficMonitorLayerC.SubState -> RF230DriverLayerC;
  
  // -------- CollisionAvoidance
--- 109,120 ----
  
  	components MessageBufferLayerC;
! 	MessageBufferLayerC.RadioSend -> CollisionAvoidanceLayerC;
  	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
! 	MessageBufferLayerC.RadioState -> CollisionAvoidanceLayerC;
  	RadioChannel = MessageBufferLayerC;
  
  // -------- UniqueLayer receive part (wired twice)
  
! 	UniqueLayerC.SubReceive -> CollisionAvoidanceLayerC;
  
  // -------- CollisionAvoidance