[Tinyos-2-commits] CVS: tinyos-2.x/tos/system ActiveMessageAddressC.nc, 1.6, 1.7

[dmm]

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

Modified Files:
	ActiveMessageAddressC.nc 
Log Message:
Updated the ActiveMessageAddress interface after discovering issues with calling setAmGroup() and setAmAddress() separately and having the radio try to split-phase sync() with each one of those.

Index: ActiveMessageAddressC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/ActiveMessageAddressC.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ActiveMessageAddressC.nc	14 Jun 2007 04:39:02 -0000	1.6
--- ActiveMessageAddressC.nc	19 Jun 2007 17:30:08 -0000	1.7
***************
*** 65,72 ****
    /**
     * Set the active message address of this node
!    * @param a The target active message address
     */
!   async command void ActiveMessageAddress.setAmAddress(am_addr_t a) {
!     call setAmAddress(a);
    }
    
--- 65,77 ----
    /**
     * 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 void ActiveMessageAddress.setAddress(am_group_t myGroup, am_addr_t myAddr) {
!     atomic {
!       addr = myAddr;
!       group = myGroup;
!     }
!     signal ActiveMessageAddress.changed();
    }
    
***************
*** 81,92 ****
    }
    
-   /**
-    * Set the group address of this node
-    * @param group The group address
-    */
-   async command void ActiveMessageAddress.setAmGroup(am_group_t myGroup) {
-     atomic group = myGroup;
-     signal ActiveMessageAddress.changed();
-   }
  
    /***************** Deprecated Commands ****************/
--- 86,89 ----
***************
*** 106,110 ****
     *
     * @param a - the address.
!    * @deprecated Use ActiveMessageAddress.setAmAddress() instead
     */
    async command void setAmAddress(am_addr_t a) {
--- 103,107 ----
     *
     * @param a - the address.
!    * @deprecated Use ActiveMessageAddress.setAddress() instead
     */
    async command void setAmAddress(am_addr_t a) {