[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/xe1205 XE1205SpiImplP.nc, 1.1.2.2, 1.1.2.3

Kevin Klues klueska at users.sourceforge.net
Tue Aug 15 04:59:11 PDT 2006


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	XE1205SpiImplP.nc 
Log Message:
Update to Resource and Power Manager stuff

Index: XE1205SpiImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205SpiImplP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** XE1205SpiImplP.nc	20 Jun 2006 18:56:06 -0000	1.1.2.2
--- XE1205SpiImplP.nc	15 Aug 2006 11:59:09 -0000	1.1.2.3
***************
*** 134,143 ****
    }
  
!   async command void Resource.release[ uint8_t id ]() {
      uint8_t i;
      atomic {
        if ( m_holder != id ) {
  	xe1205check(11, 1);
! 	return;
        }
  
--- 134,143 ----
    }
  
!   async command error_t Resource.release[ uint8_t id ]() {
      uint8_t i;
      atomic {
        if ( m_holder != id ) {
  	xe1205check(11, 1);
! 	return FAIL;
        }
  
***************
*** 155,162 ****
  	    m_requests &= ~( 1 << i );
  	    call SpiResource.request();
! 	    return;
  	  }
  	}
        }
      }
    }
--- 155,163 ----
  	    m_requests &= ~( 1 << i );
  	    call SpiResource.request();
! 	    return SUCCESS;
  	  }
  	}
        }
+       return SUCCESS;
      }
    }



More information about the Tinyos-2-commits mailing list