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

[Miklos Maroti]

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

Modified Files:
	RF230ActiveMessageC.nc RF230ActiveMessageP.nc 
Log Message:
Use BareSend/BareReceive instead of Send/Receive to avoid duplication of payload handling code

Index: RF230ActiveMessageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RF230ActiveMessageC.nc	8 Apr 2009 22:16:20 -0000	1.7
--- RF230ActiveMessageC.nc	9 Apr 2009 20:48:04 -0000	1.8
***************
*** 91,95 ****
  	components LowpanNetworkLayerC;
  #endif
! 	LowpanNetworkLayerC.SubSend -> UniqueLayerC;
  	LowpanNetworkLayerC.SubReceive -> LowPowerListeningLayerC;
  	LowpanNetworkLayerC.SubPacket -> IEEE154MessageLayerC;
--- 91,95 ----
  	components LowpanNetworkLayerC;
  #endif
! 	LowpanNetworkLayerC.SubSend -> IEEE154MessageLayerC;
  	LowpanNetworkLayerC.SubReceive -> LowPowerListeningLayerC;
  	LowpanNetworkLayerC.SubPacket -> IEEE154MessageLayerC;
***************
*** 99,102 ****
--- 99,103 ----
  	components IEEE154MessageLayerC;
  	IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
+ 	IEEE154MessageLayerC.SubSend -> UniqueLayerC;
  
  // -------- UniqueLayer Send part (wired twice)
***************
*** 109,112 ****
--- 110,114 ----
  
  #ifdef LOW_POWER_LISTENING
+ 	#warning "*** USING LOW POWER LISTENING LAYER"
  	components LowPowerListeningLayerC;
  	LowPowerListeningLayerC.Config -> RF230ActiveMessageP;
***************
*** 125,128 ****
--- 127,131 ----
  
  #ifdef PACKET_LINK
+ 	#warning "*** USING PACKET LINK LAYER"
  	components PacketLinkLayerC;
  	PacketLink = PacketLinkLayerC;
***************
*** 137,141 ****
  
  	components MessageBufferLayerC;
- 	MessageBufferLayerC.Packet -> ActiveMessageLayerC;
  	MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
  	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
--- 140,143 ----

Index: RF230ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/rf230/RF230ActiveMessageP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RF230ActiveMessageP.nc	7 Apr 2009 02:27:44 -0000	1.7
--- RF230ActiveMessageP.nc	9 Apr 2009 20:48:04 -0000	1.8
***************
*** 153,161 ****
  /*----------------- ActiveMessageConfig -----------------*/
  
- 	command bool ActiveMessageConfig.forgotToClear(message_t* msg)
- 	{
- 		return ! call IEEE154MessageLayer.isDataFrame(msg);
- 	}
- 
  	command am_addr_t ActiveMessageConfig.destination(message_t* msg)
  	{
--- 153,156 ----