[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tossim TossimRadioMsg.h, 1.3, 1.4 TossimActiveMessageP.nc, 1.6, 1.7

[Chad Metcalf]

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

Modified Files:
	TossimRadioMsg.h TossimActiveMessageP.nc 
Log Message:
Added the AM group stuff.


Index: TossimRadioMsg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/TossimRadioMsg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TossimRadioMsg.h	7 Nov 2006 19:31:21 -0000	1.3
--- TossimRadioMsg.h	22 Jun 2007 21:15:01 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
    nx_am_addr_t src;
    nx_uint8_t length;
+   nx_am_group_t group;
    nx_am_id_t type;
  } tossim_header_t;

Index: TossimActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tossim/TossimActiveMessageP.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TossimActiveMessageP.nc	17 May 2007 22:03:59 -0000	1.6
--- TossimActiveMessageP.nc	22 Jun 2007 21:15:01 -0000	1.7
***************
*** 192,199 ****
    }
  
!   //command am_group_t AMPacket.group(message_t* amsg) {
!   //  return amsg->header.group;
!   //}
    
   default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) {
      return msg;
--- 192,209 ----
    }
  
!   command am_group_t AMPacket.group(message_t* amsg) {
!     tossim_header_t* header = getHeader(amsg);
!     return header->group;
!   }
    
+   command void AMPacket.setGroup(message_t* msg, am_group_t group) {
+     tossim_header_t* header = getHeader(msg);
+     header->group = group;
+   }
+ 
+   command am_group_t AMPacket.localGroup() {
+     return TOS_AM_GROUP;
+   }
+ 
   default event message_t* Receive.receive[am_id_t id](message_t* msg, void* payload, uint8_t len) {
      return msg;