[Tinyos-2-commits] CVS: tinyos-2.x/apps/Oscilloscope OscilloscopeC.nc, 1.2, 1.3

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/Oscilloscope
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27056/apps/Oscilloscope

Modified Files:
	OscilloscopeC.nc 
Log Message:
The big interface switchover for Packet, Send, Receive, and AMSend.


Index: OscilloscopeC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/Oscilloscope/OscilloscopeC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OscilloscopeC.nc	12 Jul 2006 16:59:02 -0000	1.2
--- OscilloscopeC.nc	13 Sep 2007 23:10:20 -0000	1.3
***************
*** 102,106 ****
  	if (!sendbusy && sizeof local <= call AMSend.maxPayloadLength())
  	  {
! 	    memcpy(call AMSend.getPayload(&sendbuf), &local, sizeof local);
  	    if (call AMSend.send(AM_BROADCAST_ADDR, &sendbuf, sizeof local) == SUCCESS)
  	      sendbusy = TRUE;
--- 102,108 ----
  	if (!sendbusy && sizeof local <= call AMSend.maxPayloadLength())
  	  {
! 	    // Don't need to check for null because we've already checked length
! 	    // above
! 	    memcpy(call AMSend.getPayload(&sendbuf, sizeof(local)), &local, sizeof local);
  	    if (call AMSend.send(AM_BROADCAST_ADDR, &sendbuf, sizeof local) == SUCCESS)
  	      sendbusy = TRUE;