Fix the issue with tos-deluge not timing out properly.

[tinyos-2.x.git] / tos / interfaces / ActiveMessageAddress.nc

diff --git a/tos/interfaces/ActiveMessageAddress.nc b/tos/interfaces/ActiveMessageAddress.nc
index 7d43d7f8e4bec982f4fbf533b05ea31566f7f3d4..0e6293157cdeeb5a2c084bd1c9f8413e782642f3 100644 (file)
--- a/tos/interfaces/ActiveMessageAddress.nc
+++ b/tos/interfaces/ActiveMessageAddress.nc
@@ -29,34 +29,31 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE
  */
 
+#include "AM.h"
+
 /**
  * @author Phil Levis
  * @author David Moss
  */
 interface ActiveMessageAddress {
+
   /**
-   * @return the active message address of this node
+   * Set the active message address of this node
+   * @param group The node's group ID
+   * @param addr The node's active message address
    */
-  async command am_addr_t amAddress();
+  async command void setAddress(am_group_t group, am_addr_t addr);
   
   /**
-   * Set the active message address of this node
-   * @param addr The target active message address
+   * @return the active message address of this node
    */
-  async command void setAmAddress(am_addr_t addr);
+  async command am_addr_t amAddress();
   
   /**
    * @return the group address of this node
    */
   async command am_group_t amGroup();
   
-  /**
-   * Set the group address of this node
-   * @param group The group address
-   */
-  async command void setAmGroup(am_group_t group);
-  
-  
   /**
    * Notification that the address or group settings changed.
    */