[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/sensors RssiSensorVccC.nc, 1.1.2.2, 1.1.2.3 RssiSensorVccP.nc, 1.1.2.3, 1.1.2.4

[Jan-Hinrich Hauer]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2724/tos/platforms/eyesIFX/sensors

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	RssiSensorVccC.nc RssiSensorVccP.nc 
Log Message:
Updated to work with new Msp430Adc12SingleChannel interface.

Index: RssiSensorVccC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/RssiSensorVccC.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
*** RssiSensorVccC.nc	3 Aug 2006 18:17:52 -0000	1.1.2.2
--- RssiSensorVccC.nc	9 Oct 2006 15:21:11 -0000	1.1.2.3
***************
*** 45,49 ****
  
  #include <sensors.h>
! configuration RssiSensorVccC
  {
      provides {
--- 45,49 ----
  
  #include <sensors.h>
! generic configuration RssiSensorVccC()
  {
      provides {
***************
*** 56,64 ****
      components SensorSettingsC as Settings;
      components RssiSensorVccP as RssiSensor;
!     components new Msp430Adc12FastClientC() as AdcReadNowClient;
      
      ReadNow = RssiSensor;
      ReadNowResource = RssiSensor;
!     RssiSensor.SubResource -> AdcReadNowClient;
!     RssiSensor.FastChannel -> AdcReadNowClient;
  }
--- 56,64 ----
      components SensorSettingsC as Settings;
      components RssiSensorVccP as RssiSensor;
!     components new Msp430Adc12ClientC() as AdcClient;
      
      ReadNow = RssiSensor;
      ReadNowResource = RssiSensor;
!     RssiSensor.SubResource -> AdcClient;
!     RssiSensor.SingleChannel -> AdcClient;
  }

Index: RssiSensorVccP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/Attic/RssiSensorVccP.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
*** RssiSensorVccP.nc	15 Aug 2006 11:59:09 -0000	1.1.2.3
--- RssiSensorVccP.nc	9 Oct 2006 15:21:11 -0000	1.1.2.4
***************
*** 54,58 ****
      uses {
          interface Resource as SubResource;
!         interface Msp430Adc12FastSingleChannel as FastChannel;
      }
  }
--- 54,58 ----
      uses {
          interface Resource as SubResource;
!         interface Msp430Adc12SingleChannel as SingleChannel;
      }
  }
***************
*** 60,70 ****
  {
      async command error_t ReadNow.read() {
!         return call FastChannel.getSingleData();
      }
      
!     async event void FastChannel.singleDataReady(uint16_t data) {
!         signal ReadNow.readDone(SUCCESS, data);
      }
  
      async command error_t ReadNowResource.request() {
          return call SubResource.request();
--- 60,75 ----
  {
      async command error_t ReadNow.read() {
!         return call SingleChannel.getData();
      }
      
!     async event error_t SingleChannel.singleDataReady(uint16_t data) {
!       signal ReadNow.readDone(SUCCESS, data);
!       return FAIL;  
      }
  
+     async event uint16_t* SingleChannel.multipleDataReady(uint16_t buffer[], uint16_t numSamples){
+       return 0;
+     }
+     
      async command error_t ReadNowResource.request() {
          return call SubResource.request();
***************
*** 74,78 ****
          error_t res = call SubResource.immediateRequest();
          if(res == SUCCESS) {
!             res = call FastChannel.configure(&sensorconfigurations[RSSI_SENSOR_VCC]);
              if(res != SUCCESS) call SubResource.release();
          }
--- 79,83 ----
          error_t res = call SubResource.immediateRequest();
          if(res == SUCCESS) {
!             res = call SingleChannel.configureSingle(&sensorconfigurations[RSSI_SENSOR_VCC]);
              if(res != SUCCESS) call SubResource.release();
          }
***************
*** 81,85 ****
  
      event void SubResource.granted() {
!         call FastChannel.configure(&sensorconfigurations[RSSI_SENSOR_VCC]);
          signal ReadNowResource.granted();
      }
--- 86,90 ----
  
      event void SubResource.granted() {
!         call SingleChannel.configureSingle(&sensorconfigurations[RSSI_SENSOR_VCC]);
          signal ReadNowResource.granted();
      }