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

[dmm]

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

Modified Files:
	ActiveMessageAddressC.nc 
Log Message:
Made it a little more async friendly

Index: ActiveMessageAddressC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/system/ActiveMessageAddressC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActiveMessageAddressC.nc	13 Jun 2007 20:45:29 -0000	1.5
--- ActiveMessageAddressC.nc	14 Jun 2007 04:39:02 -0000	1.6
***************
*** 76,80 ****
     */
    async command am_group_t ActiveMessageAddress.amGroup() {
!     return group;
    }
    
--- 76,82 ----
     */
    async command am_group_t ActiveMessageAddress.amGroup() {
!     am_group_t myGroup;
!     atomic myGroup = group;
!     return myGroup;
    }
    
***************
*** 84,88 ****
     */
    async command void ActiveMessageAddress.setAmGroup(am_group_t myGroup) {
!     group = myGroup;
      signal ActiveMessageAddress.changed();
    }
--- 86,90 ----
     */
    async command void ActiveMessageAddress.setAmGroup(am_group_t myGroup) {
!     atomic group = myGroup;
      signal ActiveMessageAddress.changed();
    }
***************
*** 95,99 ****
     */
    async command am_addr_t amAddress() {
!     return addr;
    }
    
--- 97,103 ----
     */
    async command am_addr_t amAddress() {
!     am_addr_t myAddr;
!     atomic myAddr = addr;
!     return myAddr;
    }
    
***************
*** 105,109 ****
     */
    async command void setAmAddress(am_addr_t a) {
!     addr = a;
      signal ActiveMessageAddress.changed();
    }
--- 109,113 ----
     */
    async command void setAmAddress(am_addr_t a) {
!     atomic addr = a;
      signal ActiveMessageAddress.changed();
    }