[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/layers IEEE154NetworkLayerC.nc, 1.1, 1.2 IEEE154NetworkLayerP.nc, 1.1, 1.2

[Miklos Maroti]

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

Modified Files:
	IEEE154NetworkLayerC.nc IEEE154NetworkLayerP.nc 
Log Message:
rename IEEE154Packet components to avoid a clash with blip

Index: IEEE154NetworkLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/IEEE154NetworkLayerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IEEE154NetworkLayerC.nc	10 Mar 2009 20:37:58 -0000	1.1
--- IEEE154NetworkLayerC.nc	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 40,44 ****
  implementation
  {
! 	components IEEE154NetworkLayerP, IEEE154PacketC;
  
  	SplitControl = SubControl;
--- 40,44 ----
  implementation
  {
! 	components IEEE154NetworkLayerP, IEEE154Packet2C;
  
  	SplitControl = SubControl;
***************
*** 50,53 ****
  	SubReceive = IEEE154NetworkLayerP;
  
! 	IEEE154NetworkLayerP.IEEE154Packet -> IEEE154PacketC;
  }
--- 50,53 ----
  	SubReceive = IEEE154NetworkLayerP;
  
! 	IEEE154NetworkLayerP.IEEE154Packet2 -> IEEE154Packet2C;
  }

Index: IEEE154NetworkLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/IEEE154NetworkLayerP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IEEE154NetworkLayerP.nc	10 Mar 2009 20:37:58 -0000	1.1
--- IEEE154NetworkLayerP.nc	29 Mar 2009 21:12:06 -0000	1.2
***************
*** 36,40 ****
  		interface Receive as SubReceive;
  
! 		interface IEEE154Packet;
  	}
  }
--- 36,40 ----
  		interface Receive as SubReceive;
  
! 		interface IEEE154Packet2;
  	}
  }
***************
*** 48,52 ****
  	command error_t Send.send(message_t* msg, uint8_t len)
  	{
! 		call IEEE154Packet.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID);
  		return call SubSend.send(msg, len);
  	}
--- 48,52 ----
  	command error_t Send.send(message_t* msg, uint8_t len)
  	{
! 		call IEEE154Packet2.set6LowPan(msg, TINYOS_6LOWPAN_NETWORK_ID);
  		return call SubSend.send(msg, len);
  	}
***************
*** 74,78 ****
  	event message_t *SubReceive.receive(message_t *msg, void *payload, uint8_t len)
  	{
! 		uint8_t network = call IEEE154Packet.get6LowPan(msg);
  		if( network == TINYOS_6LOWPAN_NETWORK_ID )
  			return signal Receive.receive(msg, payload, len);
--- 74,78 ----
  	event message_t *SubReceive.receive(message_t *msg, void *payload, uint8_t len)
  	{
! 		uint8_t network = call IEEE154Packet2.get6LowPan(msg);
  		if( network == TINYOS_6LOWPAN_NETWORK_ID )
  			return signal Receive.receive(msg, payload, len);