[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/mts300 PhotoTempControlP.nc, 1.3, 1.4

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mts300
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18668

Modified Files:
	PhotoTempControlP.nc 
Log Message:
fix resource sharing - use isOwner


Index: PhotoTempControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mts300/PhotoTempControlP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PhotoTempControlP.nc	14 Mar 2007 07:02:47 -0000	1.3
--- PhotoTempControlP.nc	22 May 2007 18:49:53 -0000	1.4
***************
*** 14,20 ****
  implementation
  {
! 	uint8_t	rflag=0;
! 
! 	command error_t SplitControl.start() {
      call PhotoTempResource.request();
      return SUCCESS;
--- 14,18 ----
  implementation
  {
!   command error_t SplitControl.start() {
      call PhotoTempResource.request();
      return SUCCESS;
***************
*** 28,32 ****
  
    event void Timer.fired() {
!     signal SplitControl.startDone(SUCCESS);
    }
  
--- 26,31 ----
  
    event void Timer.fired() {
!     if (call PhotoTempResource.isOwner())
!       signal SplitControl.startDone(SUCCESS);
    }
  
***************
*** 47,59 ****
    command error_t Read.read[uint8_t client]() {
      id = client;
-     atomic rflag=1;
      return call ActualRead.read();
    }
  
    event void ActualRead.readDone(error_t result, uint16_t val) {
!     if(rflag != 1) return;
!   	atomic rflag=0;
!     call SplitControl.stop();
!     signal Read.readDone[id](result, val);
    }
  
--- 46,55 ----
    command error_t Read.read[uint8_t client]() {
      id = client;
      return call ActualRead.read();
    }
  
    event void ActualRead.readDone(error_t result, uint16_t val) {
!     if (call PhotoTempResource.isOwner())
!       signal Read.readDone[id](result, val);
    }