[Tinyos-2-commits] CVS: tinyos-2.x/tos/interfaces AsyncQueue.nc, NONE, 1.1.2.1 AsyncResource.nc, NONE, 1.1.2.1 AsyncResourceController.nc, NONE, 1.1.2.1 ImmediateResource.nc, NONE, 1.1.2.1 PreambleLength.nc, NONE, 1.1.2.1 Queue.nc, NONE, 1.1.2.1 Resource.nc, 1.1.2.9, 1.1.2.9.2.1 ResourceController.nc, 1.1.2.3, 1.1.2.3.2.1

Mon May 15 11:18:01 PDT 2006

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

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	Resource.nc ResourceController.nc 
Added Files:
      Tag: tos-2-resource-pm-eval-cand
	AsyncQueue.nc AsyncResource.nc AsyncResourceController.nc 
	ImmediateResource.nc PreambleLength.nc Queue.nc 
Log Message:
Interface changes and new interfaces for arbiters

--- NEW FILE: AsyncQueue.nc ---
/*
 * "Copyright (c) 2005 Washington University in St. Louis.
 * All rights reserved.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose, without fee, and without written agreement is
 * hereby granted, provided that the above copyright notice, the following
 * two paragraphs and the author appear in all copies of this software.
 *
 * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY
 * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
 * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON
 * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO
 * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 * MODIFICATIONS."
 */

/**
 *
 * @author Kevin Klues (klueska at cs.wustl.edu)
 * @version $Revision: 1.1.2.1 $
 * @date $Date: 2006/05/15 18:17:59 $
 */

interface AsyncQueue {
  async command error_t push(uint8_t id);
  async command uint8_t pop();
  async command bool isEmpty();
}

--- NEW FILE: AsyncResource.nc ---
/*
 * "Copyright (c) 2005 Washington University in St. Louis.
 * All rights reserved.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose, without fee, and without written agreement is
 * hereby granted, provided that the above copyright notice, the following
 * two paragraphs and the author appear in all copies of this software.
 *
 * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY 
 * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING 
 * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON 
 * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO 
 * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 * MODIFICATIONS."
 */

/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - Neither the name of the Technische Universitat Berlin nor the names
 *   of its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

/*
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.2.1 $
 * $Date: 2006/05/15 18:17:59 $ 
 * ======================================================================== 
 */

/**
 * Please refer to TEP 108 for more information about this interface and its
 * intended use. 
 *
 * The Resource interface can be used to gain access to
 * shared resources. It is always offered as a parameterized
 * interface, and its users gain access to the resource through some
 * predefined arbitration policy.
 *
 * @author Kevin Klues (klueska at cs.wustl.edu)
 */

interface AsyncResource {
 /**
 * Request access to a shared resource. You must call release()
 * when you are done with it.
 *
 * @return SUCCESS When a request has been accepted. The granted()
 * event will be signaled once you have control of the
 * resource. 
 * EBUSY You have already requested this resource and a
 * granted event is pending
 */
 async command error_t request();

  /**
   * You are now in control of the resource. Note that this event
   * is NOT signaled when immediateRequest() succeeds.
   */
  event void granted();

  /**
   * Release a shared resource you previously acquired.
   */
  async command void release();

  /**
   *  Check if the user of this interface is the current
   *  owner of the Resource
   *  @return TRUE  It is the owner <br>
   *          FALSE It is not the owner
   */
  async command bool isOwner();
}

--- NEW FILE: AsyncResourceController.nc ---
/*
 * "Copyright (c) 2005 Washington University in St. Louis.
 * All rights reserved.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose, without fee, and without written agreement is
 * hereby granted, provided that the above copyright notice, the following
 * two paragraphs and the author appear in all copies of this software.
 *
 * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY 
 * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING 
 * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON 
 * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO 
 * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 * MODIFICATIONS."
 */

/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - Neither the name of the Technische Universitat Berlin nor the names
 *   of its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

/*
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.2.1 $
 * $Date: 2006/05/15 18:17:59 $ 
 * ======================================================================== 
 */

/**
 * Please refer to TEP 108 for more information about this interface and its
 * intended use. 
 *
 * This interface is an extension of the Resource interface. It has all of the
 * commands and events present in the Resource interface, along with two additional
 * events. These events allow the user of this interface to be notified whenever
 * someone requests the use of a resource or whenever the resource becomes idle.
 * One could use this interface to control access to a resource by always
 * taking control of a resource whenever it has gone idle and deciding when to
 * release it based on requests from other users.
 *
 * @author Kevin Klues (klues at tkn.tu-berlin.de)
 */

interface AsyncResourceController {
 /**
 * Request access to a shared resource. You must call release()
 * when you are done with it.
 *
 * @return SUCCESS When a request has been accepted. The granted()
 * event will be signaled once you have control of the
 * resource. 
 * EBUSY You have already requested this resource and a
 * granted event is pending
 */
 async command error_t request();

/**
 * Request immediate access to a shared resource. You must call
 * release() when you are done with it.
 *
 * @return SUCCESS You now have cotnrol of the resource. 
 * EBUSY The resource is busy. You must try again later
 */
 async command error_t immediateRequest();

  /**
  * You are now in control of the resource. Note that this event
  * is NOT signaled when immediateRequest() succeeds.
  */
  event void granted();

  /**
  * Release a shared resource you previously acquired.
  */
  async command void release();

  /**
   *  Check if the user of this interface is the current
   *  owner of the Resource
   *  @return TRUE  It is the owner <br>
   *          FALSE It is not the owner
   */
  async command bool isOwner();

  /**
   * This event is signalled whenever the user of this interface
   * currently has control of the resource, and another user requests
   * it.  You may want to consider releasing a resource based on this
   * event
   */
  event void requested();

  /**
   * Event sent to the resource controller whenever a resource goes idle.
   * That is to say, whenever no one currently owns the resource, and there
   * are no more pending requests
   */
  event void idle();
}

--- NEW FILE: ImmediateResource.nc ---
/*
 * "Copyright (c) 2005 Washington University in St. Louis.
 * All rights reserved.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose, without fee, and without written agreement is
 * hereby granted, provided that the above copyright notice, the following
 * two paragraphs and the author appear in all copies of this software.
 *
 * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY 
 * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING 
 * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON 
 * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO 
 * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 * MODIFICATIONS."
 */

/*
 * Copyright (c) 2004, Technische Universitat Berlin
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * - Redistributions of source code must retain the above copyright notice,
 *   this list of conditions and the following disclaimer.
 * - Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 * - Neither the name of the Technische Universitat Berlin nor the names
 *   of its contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
 * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

/*
 * - Revision -------------------------------------------------------------
 * $Revision: 1.1.2.1 $
 * $Date: 2006/05/15 18:17:59 $ 
 * ======================================================================== 
 */

/**
 * Please refer to TEP 108 for more information about this interface and its
 * intended use. 
 *
 * The ImmediateResource interface can be used to gain access to
 * shared resources. It is always offered as a parameterized
 * interface, and its users gain access to the resource through some
 * predefined arbitration policy.
 *
 * @author Kevin Klues (klueska at cs.wustl.edu)
 */

interface ImmediateResource {
 /**
 * Request immediate access to a shared resource. You must call 
 * release() when you are done with it.
 *
 * @return SUCCESS You now have cotnrol of the resource. 
 * EBUSY The resource is busy. You must try again later
 */
 async command error_t request();

  /**
   * Release a shared resource you previously acquired.
   */
  async command void release();

  /**
   *  Check if the user of this interface is the current
   *  owner of the Resource
   *  @return TRUE  It is the owner <br>
   *          FALSE It is not the owner
   */
  async command bool isOwner();
}

--- NEW FILE: PreambleLength.nc ---
/* Copyright (C) 2004, Washington University in Saint Louis 
 * 
 * Washington University states that this is free software; 
 * you can redistribute it and/or modify it under the terms of 
 * the current version of the GNU Lesser General Public License 
 * as published by the Free Software Foundation.
 * 
 * This software is distributed in the hope that it will be useful, but 
 * THERE ARE NO WARRANTIES, WHETHER ORAL OR WRITTEN, EXPRESS OR 
 * IMPLIED, INCLUDING BUT NOT LIMITED TO, IMPLIED WARRANTIES OF 
 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR USE.
 *
 * YOU UNDERSTAND THAT THIS SOFTWARE IS PROVIDED "AS IS" FOR WHICH NO 
 * WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. THERE ARE NO 
 * WARRANTIES AND NO REPRESENTATION THAT AGILLA IS FREE OF 
 * INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR OTHER 
 * PROPRIETARY RIGHTS.  THERE ARE NO WARRANTIES THAT SOFTWARE IS 
 * FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP DOORS", "WORMS", 
 * OR OTHER HARMFUL CODE.  
 *
 * YOU ASSUME THE ENTIRE RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR 
 * ASSOCIATED MATERIALS, AND TO THE PERFORMANCE AND VALIDITY OF 
 * INFORMATION GENERATED USING SOFTWARE. By using this code you agree to 
 * indemnify, defend, and hold harmless WU, its employees, officers and 
 * agents from any and all claims, costs, or liabilities, including 
 * attorneys fees and court costs at both the trial and appellate levels 
 * for any loss, damage, or injury caused by your actions or actions of 
 * your officers, servants, agents or third parties acting on behalf or 
 * under authorization from you, as a result of using this code. 
 *
 * See the GNU Lesser General Public License for more details, which can 
 * be found here: http://www.gnu.org/copyleft/lesser.html
 */

/* $Id: PreambleLength.nc,v 1.1.2.1 2006/05/15 18:17:59 klueska Exp $
 * @author Kevin Klues
 */  

interface PreambleLength
{
  /**
   * Set message preamble length.
   * @param bytes Preamble length in bytes
   */
  async command void set(uint16_t bytes);

  /**
   * Get message preamble length.
   * @return Preamble length in bytes
   */
  async command uint16_t get();

  /**
   * callback to query the preamble length from
   * an external component.
   * @return Preamble length in bytes
   */
  async event uint16_t query();
}

--- NEW FILE: Queue.nc ---
/*
 * "Copyright (c) 2005 Washington University in St. Louis.
 * All rights reserved.
 *
 * Permission to use, copy, modify, and distribute this software and its
 * documentation for any purpose, without fee, and without written agreement is
 * hereby granted, provided that the above copyright notice, the following
 * two paragraphs and the author appear in all copies of this software.
 *
 * IN NO EVENT SHALL WASHINGTON UNIVERSITY IN ST. LOUIS BE LIABLE TO ANY PARTY
 * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
 * OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF WASHINGTON
 * UNIVERSITY IN ST. LOUIS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 * WASHINGTON UNIVERSITY IN ST. LOUIS SPECIFICALLY DISCLAIMS ANY WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
 * ON AN "AS IS" BASIS, AND WASHINGTON UNIVERSITY IN ST. LOUIS HAS NO
 * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
 * MODIFICATIONS."
 */

/**
 *
 * @author Kevin Klues (klueska at cs.wustl.edu)
 * @version $Revision: 1.1.2.1 $
 * @date $Date: 2006/05/15 18:17:59 $
 */

interface Queue {
  command error_t push(uint8_t id);
  command uint8_t pop();
  command bool isEmpty();
}

Index: Resource.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Attic/Resource.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.9.2.1
diff -C2 -d -r1.1.2.9 -r1.1.2.9.2.1
*** Resource.nc	8 Mar 2006 02:01:47 -0000	1.1.2.9
--- Resource.nc	15 May 2006 18:17:59 -0000	1.1.2.9.2.1
***************
*** 81,94 ****
     *               granted event is pending
     */
!   async command error_t request();
!    
!   /**
!    * Request immediate access to a shared resource. You must call 
!    * release() when you are done with it.
!    *
!    * @return SUCCESS You now have cotnrol of the resource.<br>
!    *         EBUSY The resource is busy.  You must try again later
!    */
!   async command error_t immediateRequest();

    /**
--- 81,85 ----
     *               granted event is pending
     */
!   command error_t request();

    /**
***************
*** 101,105 ****
     * Release a shared resource you previously acquired.
     */
!   async command void release();

    /**
--- 92,96 ----
     * Release a shared resource you previously acquired.
     */
!   command void release();

    /**

Index: ResourceController.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/interfaces/Attic/ResourceController.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** ResourceController.nc	8 Mar 2006 02:01:48 -0000	1.1.2.3
--- ResourceController.nc	15 May 2006 18:17:59 -0000	1.1.2.3.2.1
***************
*** 84,89 ****
     *               granted event is pending
    */
!   async command error_t request();
!    
    /**
    * Request immediate access to a shared resource. You must call
--- 84,89 ----
     *               granted event is pending
    */
!   command error_t request();
! 
    /**
    * Request immediate access to a shared resource. You must call
***************
*** 93,97 ****
    *         EBUSY The resource is busy.  You must try again later
    */
!   async command error_t immediateRequest();

    /**
--- 93,97 ----
    *         EBUSY The resource is busy.  You must try again later
    */
!   command error_t immediateRequest();

    /**
***************
*** 104,108 ****
    * Release a shared resource you previously acquired.
    */
!   async command void release();

    /**
--- 104,108 ----
    * Release a shared resource you previously acquired.
    */
!   command void release();

    /**
***************
*** 120,124 ****
     * event
     */
!   async event void requested();

    /**
--- 120,124 ----
     * event
     */
!   event void requested();

    /**
***************
*** 127,130 ****
     * are no more pending requests
     */
!   async event void idle(); 
  }
--- 127,130 ----
     * are no more pending requests
     */
!   event void idle();
  }