[Tinyos-2-commits] CVS: tinyos-2.x/tos/system ArbiterP.nc,1.7,1.8

[Kevin Klues]

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

Modified Files:
	ArbiterP.nc 
Log Message:
Fix to isOwner for defaultOnwer interface

Index: ArbiterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/ArbiterP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ArbiterP.nc	7 Sep 2007 19:44:55 -0000	1.7
--- ArbiterP.nc	2 Nov 2007 06:07:49 -0000	1.8
***************
*** 177,181 ****
  
    async command uint8_t ResourceDefaultOwner.isOwner() {
!     atomic return (state == RES_CONTROLLED);
    }
    
--- 177,183 ----
  
    async command uint8_t ResourceDefaultOwner.isOwner() {
!     atomic return (state == RES_CONTROLLED
!             || (resId == default_owner_id
!                 && (state == RES_GRANTING || state == RES_IMM_GRANTING)));
    }