[Tinyos-2-commits] CVS: tinyos-2.x/tos/system AMQueueImplP.nc, 1.1.2.3, 1.1.2.4

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/system
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22967

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	AMQueueImplP.nc 
Log Message:
Fix queue bug.


Index: AMQueueImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/Attic/AMQueueImplP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** AMQueueImplP.nc	15 May 2006 16:42:04 -0000	1.1.2.3
--- AMQueueImplP.nc	9 Jun 2006 01:48:28 -0000	1.1.2.4
***************
*** 90,99 ****
        am_addr_t dest = call AMPacket.destination(msg);
  
!       dbg("AMQueue", "AMQueue: request to send from %hhu (%p): queue empty\n", clientId, msg);
        current = clientId;
  
        err = call AMSend.send[amId](dest, msg, len);
        if (err != SUCCESS) {
  	current = QUEUE_EMPTY;
        }
        return err;
--- 90,101 ----
        am_addr_t dest = call AMPacket.destination(msg);
  
!       dbg("AMQueue", "%s: request to send from %hhu (%p): queue empty\n", __FUNCTION__, clientId, msg);
        current = clientId;
  
        err = call AMSend.send[amId](dest, msg, len);
        if (err != SUCCESS) {
+         dbg("AMQueue", "%s: underlying send failed.\n", __FUNCTION__);
  	current = QUEUE_EMPTY;
+ 	queue[clientId].msg = NULL;
        }
        return err;