[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/spi Atm128SpiC.nc, 1.1.2.8, 1.1.2.9 Atm128SpiP.nc, 1.1.2.8, 1.1.2.9

[Kevin Klues]

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

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

Index: Atm128SpiC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi/Atm128SpiC.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** Atm128SpiC.nc	29 Jan 2006 18:06:19 -0000	1.1.2.8
--- Atm128SpiC.nc	15 Aug 2006 11:59:08 -0000	1.1.2.9
***************
*** 72,80 ****
    components Atm128SpiP as SpiMaster, HplAtm128SpiC as HplSpi;
    components HplAtm128GeneralIOC as IO;
!   components new FcfsArbiterC("Atm128SpiC.Resource") as Arbiter;
    components McuSleepC;
    
    Init         = SpiMaster;
-   Init         = Arbiter;
    
    SpiByte      = SpiMaster;
--- 72,79 ----
    components Atm128SpiP as SpiMaster, HplAtm128SpiC as HplSpi;
    components HplAtm128GeneralIOC as IO;
!   components new SimpleFcfsArbiterC("Atm128SpiC.Resource") as Arbiter;
    components McuSleepC;
    
    Init         = SpiMaster;
    
    SpiByte      = SpiMaster;

Index: Atm128SpiP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/spi/Atm128SpiP.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** Atm128SpiP.nc	8 Mar 2006 02:01:44 -0000	1.1.2.8
--- Atm128SpiP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.9
***************
*** 292,297 ****
   }
  
!  async command void Resource.release[ uint8_t id ]() {
!    call ResourceArbiter.release[ id ]();
     atomic {
       if (!call ArbiterInfo.inUse()) {
--- 292,297 ----
   }
  
!  async command error_t Resource.release[ uint8_t id ]() {
!    error_t error = call ResourceArbiter.release[ id ]();
     atomic {
       if (!call ArbiterInfo.inUse()) {
***************
*** 299,302 ****
--- 299,303 ----
       }
     }
+    return error;
   }