[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/power DeferredPowerManagerP.nc, 1.5, 1.6

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/power
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1931

Modified Files:
	DeferredPowerManagerP.nc 
Log Message:
Added patch to DeferredPowerManager to check for EALREADY when starting or stopping to decide if we should release or not

Index: DeferredPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/DeferredPowerManagerP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DeferredPowerManagerP.nc	4 Feb 2007 19:55:48 -0000	1.5
--- DeferredPowerManagerP.nc	2 Mar 2009 21:05:10 -0000	1.6
***************
*** 71,75 ****
      stopTimer = FALSE;
      call StdControl.start();
!     call SplitControl.start();
    }
  
--- 71,76 ----
      stopTimer = FALSE;
      call StdControl.start();
!     if (call SplitControl.start()==EALREADY)
!       call ResourceDefaultOwner.release();
    }
  
***************
*** 83,87 ****
        post startTask();
      }
!     else atomic requested = TRUE;
    }
  
--- 84,88 ----
        post startTask();
      }
!     else requested = TRUE;
    }
  
***************
*** 106,114 ****
  
    event void TimerMilli.fired() {
!     if(stopTimer == FALSE) {
!       stopping = TRUE;
!       call PowerDownCleanup.cleanup();
!       call StdControl.stop();
!       call SplitControl.stop();
      }
    }
--- 107,118 ----
  
    event void TimerMilli.fired() {
!     atomic {
!       if(stopTimer == FALSE) {
!         stopping = TRUE;
!         call PowerDownCleanup.cleanup();
!         call StdControl.stop();
!         if (call SplitControl.stop()==EALREADY)
!           signal SplitControl.stopDone(SUCCESS);
!       }
      }
    }