[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/rf2xx/layers ActiveMessageLayerC.nc, 1.3, 1.4 ActiveMessageLayerP.nc, 1.2, 1.3 IEEE154MessageLayerC.nc, 1.2, 1.3 IEEE154MessageLayerP.nc, 1.2, 1.3

[Miklos Maroti]

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

Modified Files:
	ActiveMessageLayerC.nc ActiveMessageLayerP.nc 
	IEEE154MessageLayerC.nc IEEE154MessageLayerP.nc 
Log Message:
add the SendNotifier interface

Index: ActiveMessageLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/ActiveMessageLayerC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ActiveMessageLayerC.nc	7 Apr 2009 02:27:43 -0000	1.3
--- ActiveMessageLayerC.nc	8 Apr 2009 22:16:16 -0000	1.4
***************
*** 32,35 ****
--- 32,36 ----
  		interface Receive[am_id_t id];
  		interface Receive as Snoop[am_id_t id];	
+ 		interface SendNotifier[am_id_t id];
  	}
  
***************
*** 54,57 ****
--- 55,59 ----
  	Receive = ActiveMessageLayerP.Receive;
  	Snoop = ActiveMessageLayerP.Snoop;
+ 	SendNotifier = ActiveMessageLayerP;
  	
  	SubPacket = ActiveMessageLayerP;

Index: ActiveMessageLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/ActiveMessageLayerP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActiveMessageLayerP.nc	7 Apr 2009 02:27:43 -0000	1.2
--- ActiveMessageLayerP.nc	8 Apr 2009 22:16:18 -0000	1.3
***************
*** 34,37 ****
--- 34,38 ----
  		interface Receive[am_id_t id];
  		interface Receive as Snoop[am_id_t id];	
+ 		interface SendNotifier[am_id_t id];
  	}
  
***************
*** 69,72 ****
--- 70,75 ----
  		call AMPacket.setDestination(msg, addr);
  
+ 		signal SendNotifier.aboutToSend[id](addr, msg);
+ 
  		return call SubSend.send(msg, len);
  	}
***************
*** 96,99 ****
--- 99,106 ----
  	}
  
+ 	default event void SendNotifier.aboutToSend[am_id_t id](am_addr_t addr, message_t* msg)
+ 	{
+ 	}
+ 
  /*----------------- Receive -----------------*/
  

Index: IEEE154MessageLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/IEEE154MessageLayerC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IEEE154MessageLayerC.nc	7 Apr 2009 02:27:43 -0000	1.2
--- IEEE154MessageLayerC.nc	8 Apr 2009 22:16:18 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  		interface Packet;
  		interface Ieee154Send;
+ 		interface SendNotifier;
  	}
  
***************
*** 52,54 ****
--- 53,56 ----
  	Ieee154Send = IEEE154MessageLayerP;
  	SubSend = IEEE154MessageLayerP;
+ 	SendNotifier = IEEE154MessageLayerP;
  }

Index: IEEE154MessageLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/rf2xx/layers/IEEE154MessageLayerP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IEEE154MessageLayerP.nc	7 Apr 2009 02:27:43 -0000	1.2
--- IEEE154MessageLayerP.nc	8 Apr 2009 22:16:18 -0000	1.3
***************
*** 33,36 ****
--- 33,37 ----
  		interface Packet;
  		interface Ieee154Send;
+ 		interface SendNotifier;
  	}
  
***************
*** 337,342 ****
  	    	header->src = call Ieee154Packet.address();
  		
! 		// Notifier (in original ActiveMessage) --> Not used in CC2420
! 	    	// signal SendNotifier.aboutToSend(addr, msg);
      	
      		return call SubSend.send(msg, len);
--- 338,342 ----
  	    	header->src = call Ieee154Packet.address();
  		
!     		signal SendNotifier.aboutToSend(addr, msg);
      	
      		return call SubSend.send(msg, len);
***************
*** 351,353 ****
--- 351,357 ----
  	{
  	}
+ 
+ 	default event void SendNotifier.aboutToSend(am_addr_t addr, message_t* msg)
+ 	{
+ 	}
  }