[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/xe1205 XE1205.h, 1.1.2.1, 1.1.2.2 XE1205ActiveMessageP.nc, 1.1.2.1, 1.1.2.2

[Henri DF]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	XE1205.h XE1205ActiveMessageP.nc 
Log Message:
track recent changes that added a source field to AMPacket.

Index: XE1205.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** XE1205.h	24 Apr 2006 16:06:48 -0000	1.1.2.1
--- XE1205.h	9 Aug 2006 16:27:16 -0000	1.1.2.2
***************
*** 49,53 ****
  
  typedef nx_struct xe1205_header_t {
!   nx_am_addr_t addr;
    nx_am_id_t type;
    nx_am_group_t group;
--- 49,54 ----
  
  typedef nx_struct xe1205_header_t {
!   nx_am_addr_t dest;
!   nx_am_addr_t source;
    nx_am_id_t type;
    nx_am_group_t group;

Index: XE1205ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/xe1205/XE1205ActiveMessageP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** XE1205ActiveMessageP.nc	24 Apr 2006 16:06:48 -0000	1.1.2.1
--- XE1205ActiveMessageP.nc	9 Aug 2006 16:27:16 -0000	1.1.2.2
***************
*** 60,69 ****
    command am_addr_t AMPacket.destination(message_t* msg) {
      xe1205_header_t* header = getHeader(msg);
!     return header->addr;
    }
  
    command void AMPacket.setDestination(message_t* msg, am_addr_t addr) {
      xe1205_header_t* header = getHeader(msg);
!     header->addr = addr;
    }
    
--- 60,79 ----
    command am_addr_t AMPacket.destination(message_t* msg) {
      xe1205_header_t* header = getHeader(msg);
!     return header->dest;
    }
  
    command void AMPacket.setDestination(message_t* msg, am_addr_t addr) {
      xe1205_header_t* header = getHeader(msg);
!     header->dest = addr;
!   }
!   
!   command am_addr_t AMPacket.source(message_t* msg) {
!     xe1205_header_t* header = getHeader(msg);
!     return header->source;
!   }
! 
!   command void AMPacket.setSource(message_t* msg, am_addr_t addr) {
!     xe1205_header_t* header = getHeader(msg);
!     header->source = addr;
    }
    
***************
*** 96,100 ****
      xe1205_header_t* header = getHeader(msg);
      header->type = id;
!     header->addr = addr;
      header->group = TOS_AM_GROUP;
      return call SubSend.send(msg, len);
--- 106,111 ----
      xe1205_header_t* header = getHeader(msg);
      header->type = id;
!     header->dest = addr;
!     header->source = call AMPacket.address();
      header->group = TOS_AM_GROUP;
      return call SubSend.send(msg, len);