[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/i2c Atm128I2CMasterImplP.nc, 1.1.2.1, 1.1.2.2 Atm128I2CMasterP.nc, 1.1.2.4, 1.1.2.5

[Kevin Klues]

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

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

Index: Atm128I2CMasterImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/i2c/Atm128I2CMasterImplP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Atm128I2CMasterImplP.nc	8 Jun 2006 03:22:03 -0000	1.1.2.1
--- Atm128I2CMasterImplP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.2
***************
*** 70,76 ****
    }
  
!   async command void Resource.release[uint8_t id]() {
      call Atm128I2C.stop(); // Always stop if someone has released.
!     call SubResource.release[id]();
    }
  
--- 70,76 ----
    }
  
!   async command error_t Resource.release[uint8_t id]() {
      call Atm128I2C.stop(); // Always stop if someone has released.
!     return call SubResource.release[id]();
    }
  

Index: Atm128I2CMasterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/i2c/Atm128I2CMasterP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** Atm128I2CMasterP.nc	13 Jun 2006 21:12:25 -0000	1.1.2.4
--- Atm128I2CMasterP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.5
***************
*** 56,64 ****
    components new Atm128I2CMasterPacketP() as Master;
    components HplAtm128I2CBusC;
!   components LedsC, NoLedsC, MainC;
      
    Resource  = I2C;
    I2CPacket = I2C;
-   MainC.SoftwareInit -> Power;
    
    I2C.SubResource -> Arbiter;
--- 56,63 ----
    components new Atm128I2CMasterPacketP() as Master;
    components HplAtm128I2CBusC;
!   components LedsC, NoLedsC;
      
    Resource  = I2C;
    I2CPacket = I2C;
    
    I2C.SubResource -> Arbiter;
***************
*** 68,72 ****
    Power.AsyncStdControl -> Master;
    Power.ResourceController -> Arbiter;
-   Power.ArbiterInit -> Arbiter;
  
    Master.I2C -> HplAtm128I2CBusC;
--- 67,70 ----