[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 AdcC.nc, 1.1.2.15, 1.1.2.16 Msp430Adc12C.nc, 1.1.2.9, 1.1.2.10 Msp430RefVoltArbiterP.nc, 1.1.2.5, 1.1.2.6

[Kevin Klues]

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

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

Index: AdcC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/AdcC.nc,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** AdcC.nc	7 Jul 2006 15:13:27 -0000	1.1.2.15
--- AdcC.nc	15 Aug 2006 11:59:08 -0000	1.1.2.16
***************
*** 270,279 ****
    default async command error_t Resource.request[uint8_t client]() { return FAIL; }
    default async command error_t Resource.immediateRequest[uint8_t client]() { return FAIL; }
!   default async command void Resource.release[uint8_t client]() { }
    default event void Read.readDone[uint8_t client]( error_t result, uint16_t val ){}
    default async event void ReadNow.readDone[uint8_t client]( error_t result, uint16_t val ){}
    
    default async command error_t ResourceReadStream.request[uint8_t rsClient]() { return FAIL; }
!   default async command void ResourceReadStream.release[uint8_t rsClient]() { }
    default event void ReadStream.bufferDone[uint8_t rsClient]( error_t result, 
  			 uint16_t* buf, uint16_t count ){}
--- 270,279 ----
    default async command error_t Resource.request[uint8_t client]() { return FAIL; }
    default async command error_t Resource.immediateRequest[uint8_t client]() { return FAIL; }
!   default async command error_t Resource.release[uint8_t client]() { return FAIL; }
    default event void Read.readDone[uint8_t client]( error_t result, uint16_t val ){}
    default async event void ReadNow.readDone[uint8_t client]( error_t result, uint16_t val ){}
    
    default async command error_t ResourceReadStream.request[uint8_t rsClient]() { return FAIL; }
!   default async command error_t ResourceReadStream.release[uint8_t rsClient]() { return FAIL; }
    default event void ReadStream.bufferDone[uint8_t rsClient]( error_t result, 
  			 uint16_t* buf, uint16_t count ){}

Index: Msp430Adc12C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12C.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** Msp430Adc12C.nc	7 Jul 2006 15:17:54 -0000	1.1.2.9
--- Msp430Adc12C.nc	15 Aug 2006 11:59:08 -0000	1.1.2.10
***************
*** 53,57 ****
  } implementation { 
    components Msp430Adc12P,HplAdc12P, Msp430TimerC, MainC, HplMsp430GeneralIOC, 
!              new RoundRobinArbiterC(MSP430ADC12_RESOURCE) as Arbiter;
  
    Resource = Arbiter;
--- 53,57 ----
  } implementation { 
    components Msp430Adc12P,HplAdc12P, Msp430TimerC, MainC, HplMsp430GeneralIOC, 
!              new SimpleRoundRobinArbiterC(MSP430ADC12_RESOURCE) as Arbiter;
  
    Resource = Arbiter;
***************
*** 59,63 ****
    FastSingleChannel = Msp430Adc12P.FastSingleChannel;
    
-   Arbiter.Init <- MainC;
    Msp430Adc12P.Init <- MainC;
    Msp430Adc12P.ADCArbiterInfo -> Arbiter;
--- 59,62 ----

Index: Msp430RefVoltArbiterP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430RefVoltArbiterP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** Msp430RefVoltArbiterP.nc	13 Jun 2006 13:31:12 -0000	1.1.2.5
--- Msp430RefVoltArbiterP.nc	15 Aug 2006 11:59:08 -0000	1.1.2.6
***************
*** 109,113 ****
    }
  
!   async command void ClientResource.release[uint8_t client]()
    {
      atomic {
--- 109,113 ----
    }
  
!   async command error_t ClientResource.release[uint8_t client]()
    {
      atomic {
***************
*** 117,121 ****
        }
      }
!     call AdcResource.release[client]();
    }
  
--- 117,121 ----
        }
      }
!     return call AdcResource.release[client]();
    }
  
***************
*** 150,154 ****
    }
  
!   default async command void AdcResource.release[uint8_t client](){}
    default async command msp430adc12_channel_config_t 
      Config.getChannelSettings[uint8_t client]()
--- 150,154 ----
    }
  
!   default async command error_t AdcResource.release[uint8_t client](){return FAIL;}
    default async command msp430adc12_channel_config_t 
      Config.getChannelSettings[uint8_t client]()