[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/sensors Msp430InternalTemperatureC.nc, 1.1.2.3, 1.1.2.4 Msp430InternalTemperatureP.nc, 1.1.2.3, 1.1.2.4 Msp430InternalVoltageC.nc, 1.1.2.4, 1.1.2.5 Msp430InternalVoltageP.nc, 1.1.2.4, 1.1.2.5

[Jan-Hinrich Hauer]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Msp430InternalTemperatureC.nc Msp430InternalTemperatureP.nc 
	Msp430InternalVoltageC.nc Msp430InternalVoltageP.nc 
Log Message:
Now provides the new AdcConfigure interface.

Index: Msp430InternalTemperatureC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/sensors/Msp430InternalTemperatureC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Msp430InternalTemperatureC.nc	20 Jun 2006 18:56:05 -0000	1.1.2.3
--- Msp430InternalTemperatureC.nc	9 Oct 2006 13:26:36 -0000	1.1.2.4
***************
*** 54,58 ****
  
    components Msp430InternalTemperatureP;
!   AdcReadClientC.Msp430Adc12Config -> Msp430InternalTemperatureP;
!   AdcReadStreamClientC.Msp430Adc12Config -> Msp430InternalTemperatureP;
  }
--- 54,58 ----
  
    components Msp430InternalTemperatureP;
!   AdcReadClientC.AdcConfigure -> Msp430InternalTemperatureP;
!   AdcReadStreamClientC.AdcConfigure -> Msp430InternalTemperatureP;
  }

Index: Msp430InternalTemperatureP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/sensors/Msp430InternalTemperatureP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** Msp430InternalTemperatureP.nc	20 Jun 2006 18:56:05 -0000	1.1.2.3
--- Msp430InternalTemperatureP.nc	9 Oct 2006 13:26:37 -0000	1.1.2.4
***************
*** 33,42 ****
  
  module Msp430InternalTemperatureP {
!   provides interface Msp430Adc12Config;
  }
  implementation {
  
!   async command msp430adc12_channel_config_t Msp430Adc12Config.getChannelSettings() {
!     msp430adc12_channel_config_t config = {
        inch: TEMPERATURE_DIODE_CHANNEL,
        sref: REFERENCE_VREFplus_AVss,
--- 33,41 ----
  
  module Msp430InternalTemperatureP {
!   provides interface AdcConfigure<const msp430adc12_channel_config_t*>;
  }
  implementation {
  
!   const msp430adc12_channel_config_t config = {
        inch: TEMPERATURE_DIODE_CHANNEL,
        sref: REFERENCE_VREFplus_AVss,
***************
*** 47,53 ****
        sampcon_ssel: SAMPCON_SOURCE_SMCLK,
        sampcon_id: SAMPCON_CLOCK_DIV_1
!     };
! 
!     return config;
    }
  }
--- 46,54 ----
        sampcon_ssel: SAMPCON_SOURCE_SMCLK,
        sampcon_id: SAMPCON_CLOCK_DIV_1
!   };
!   
!   async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration()
!   {
!     return &config;
    }
  }

Index: Msp430InternalVoltageC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/sensors/Msp430InternalVoltageC.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
*** Msp430InternalVoltageC.nc	20 Jun 2006 18:56:05 -0000	1.1.2.4
--- Msp430InternalVoltageC.nc	9 Oct 2006 13:26:37 -0000	1.1.2.5
***************
*** 56,61 ****
  
    components Msp430InternalVoltageP;
!   AdcReadClientC.Msp430Adc12Config -> Msp430InternalVoltageP;
!   AdcReadStreamClientC.Msp430Adc12Config -> Msp430InternalVoltageP;
  
    components new AdcReadNowClientC();
--- 56,61 ----
  
    components Msp430InternalVoltageP;
!   AdcReadClientC.AdcConfigure -> Msp430InternalVoltageP;
!   AdcReadStreamClientC.AdcConfigure -> Msp430InternalVoltageP;
  
    components new AdcReadNowClientC();
***************
*** 63,66 ****
    ReadNow = AdcReadNowClientC;
    
!   AdcReadNowClientC.Msp430Adc12Config -> Msp430InternalVoltageP;
  }
--- 63,66 ----
    ReadNow = AdcReadNowClientC;
    
!   AdcReadNowClientC.AdcConfigure -> Msp430InternalVoltageP;
  }

Index: Msp430InternalVoltageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/sensors/Msp430InternalVoltageP.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
*** Msp430InternalVoltageP.nc	20 Jun 2006 18:56:05 -0000	1.1.2.4
--- Msp430InternalVoltageP.nc	9 Oct 2006 13:26:37 -0000	1.1.2.5
***************
*** 33,42 ****
  
  module Msp430InternalVoltageP {
!   provides interface Msp430Adc12Config;
  }
  implementation {
  
!   async command msp430adc12_channel_config_t Msp430Adc12Config.getChannelSettings() {
!     msp430adc12_channel_config_t config = {
        inch: SUPPLY_VOLTAGE_HALF_CHANNEL,
        sref: REFERENCE_VREFplus_AVss,
--- 33,41 ----
  
  module Msp430InternalVoltageP {
!   provides interface AdcConfigure<const msp430adc12_channel_config_t*>;
  }
  implementation {
  
!   const msp430adc12_channel_config_t config = {
        inch: SUPPLY_VOLTAGE_HALF_CHANNEL,
        sref: REFERENCE_VREFplus_AVss,
***************
*** 47,53 ****
        sampcon_ssel: SAMPCON_SOURCE_SMCLK,
        sampcon_id: SAMPCON_CLOCK_DIV_1
!     };
! 
!     return config;
    }
  }
--- 46,54 ----
        sampcon_ssel: SAMPCON_SOURCE_SMCLK,
        sampcon_id: SAMPCON_CLOCK_DIV_1
!   };
!   
!   async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration()
!   {
!     return &config;
    }
  }