[Tinyos-2-commits] CVS: tinyos-2.x/tos/interfaces AsyncStdControl.nc, 1.4, 1.5 SplitControl.nc, 1.4, 1.5 StdControl.nc, 1.4, 1.5

[Kevin Klues]

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

Modified Files:
	AsyncStdControl.nc SplitControl.nc StdControl.nc 
Log Message:
Update of Std/Split Control interface definitions to be in line with TEP115.  Also added the EALREADY type to TinyError.h so that providers of the SplitControl interface can return this value

Index: AsyncStdControl.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/AsyncStdControl.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AsyncStdControl.nc	12 Dec 2006 18:23:14 -0000	1.4
--- AsyncStdControl.nc	15 Apr 2007 21:11:38 -0000	1.5
***************
*** 68,72 ****
     * Start this component and all of its subcomponents.
     *
!    * @return SUCCESS if the component was successfully turned on<br>
     *         FAIL otherwise
     */
--- 68,73 ----
     * Start this component and all of its subcomponents.
     *
!    * @return SUCCESS if the component was either already on or was 
!    *         successfully turned on<br>
     *         FAIL otherwise
     */
***************
*** 77,81 ****
     * subcomponents may be turned off due to wakeup timers, etc.).
     *
!    * @return SUCCESS if the component was successfully turned off<br>
     *         FAIL otherwise
     */
--- 78,83 ----
     * subcomponents may be turned off due to wakeup timers, etc.).
     *
!    * @return SUCCESS if the component was either already off or was 
!    *         successfully turned off<br>
     *         FAIL otherwise
     */

Index: SplitControl.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/SplitControl.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SplitControl.nc	12 Dec 2006 18:23:15 -0000	1.4
--- SplitControl.nc	15 Apr 2007 21:11:38 -0000	1.5
***************
*** 71,78 ****
     * event being signalled.
     *
!    * @return SUCCESS if issuing the start command was successful<br>
     *         EBUSY if the component is in the middle of powering down
     *               i.e. a <code>stop()</code> command has been called,
     *               and a <code>stopDone()</code> event is pending<br>
     *         FAIL Otherwise
     */
--- 71,82 ----
     * event being signalled.
     *
!    * @return SUCCESS if the device is already in the process of 
!    *         starting or the device was off and the device is now ready to turn 
!    *         on.  After receiving this return value, you should expect a 
!    *         <code>startDone</code> event in the near future.<br>
     *         EBUSY if the component is in the middle of powering down
     *               i.e. a <code>stop()</code> command has been called,
     *               and a <code>stopDone()</code> event is pending<br>
+    *         EALREADY if the device is already on <br>
     *         FAIL Otherwise
     */
***************
*** 89,101 ****
  
    /**
!    * Stop the component and pertinent subcomponents (not all
!    * subcomponents may be turned off due to wakeup timers, etc.).
!    * Return values of SUCCESS will always result in a
!    * <code>stopDone()</code> event being signalled.
     *
!    * @return SUCCESS if issuing the stop command was successful<br>
     *         EBUSY if the component is in the middle of powering up
     *               i.e. a <code>start()</code> command has been called,
     *               and a <code>startDone()</code> event is pending<br>
     *         FAIL Otherwise
     */
--- 93,108 ----
  
    /**
!    * Start this component and all of its subcomponents.  Return
!    * values of SUCCESS will always result in a <code>startDone()</code>
!    * event being signalled.
     *
!    * @return SUCCESS if the device is already in the process of 
!    *         stopping or the device was on and the device is now ready to turn 
!    *         off.  After receiving this return value, you should expect a 
!    *         <code>stopDone</code> event in the near future.<br>
     *         EBUSY if the component is in the middle of powering up
     *               i.e. a <code>start()</code> command has been called,
     *               and a <code>startDone()</code> event is pending<br>
+    *         EALREADY if the device is already off <br>
     *         FAIL Otherwise
     */

Index: StdControl.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/StdControl.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StdControl.nc	12 Dec 2006 18:23:15 -0000	1.4
--- StdControl.nc	15 Apr 2007 21:11:38 -0000	1.5
***************
*** 66,83 ****
  {
    /**
!   * Start this component and all of its subcomponents.
!   *
!   * @return SUCCESS if the component was successfully turned on<br>
!   *         FAIL otherwise
!   */
    command error_t start();
  
    /**
!   * Stop the component and any pertinent subcomponents (not all
!   * subcomponents may be turned off due to wakeup timers, etc.).
!   *
!   * @return SUCCESS if the component was successfully turned off<br>
!   *         FAIL otherwise
!   */
    command error_t stop();
  }
--- 66,85 ----
  {
    /**
!    * Start this component and all of its subcomponents.
!    *
!    * @return SUCCESS if the component was either already on or was 
!    *         successfully turned on<br>
!    *         FAIL otherwise
!    */
    command error_t start();
  
    /**
!    * Stop the component and any pertinent subcomponents (not all
!    * subcomponents may be turned off due to wakeup timers, etc.).
!    *
!    * @return SUCCESS if the component was either already off or was 
!    *         successfully turned off<br>
!    *         FAIL otherwise
!    */
    command error_t stop();
  }