[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/serial Serial.h, 1.1.2.14, 1.1.2.15 SerialActiveMessageP.nc, 1.1.2.10, 1.1.2.11

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Serial.h SerialActiveMessageP.nc 
Log Message:
Include source addresses in AM.


Index: Serial.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/Serial.h,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** Serial.h	3 Aug 2006 18:21:08 -0000	1.1.2.14
--- Serial.h	4 Aug 2006 00:34:18 -0000	1.1.2.15
***************
*** 111,115 ****
  
  typedef nx_struct serial_header {
!   nx_am_addr_t addr;
    nx_uint8_t length;
    nx_am_group_t group;
--- 111,116 ----
  
  typedef nx_struct serial_header {
!   nx_am_addr_t dest;
!   nx_am_addr_t src;
    nx_uint8_t length;
    nx_am_group_t group;

Index: SerialActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialActiveMessageP.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** SerialActiveMessageP.nc	25 May 2006 17:38:06 -0000	1.1.2.10
--- SerialActiveMessageP.nc	4 Aug 2006 00:34:18 -0000	1.1.2.11
***************
*** 55,62 ****
  					  uint8_t len) {
      serial_header_t* header = getHeader(msg);
!     header->addr = dest;
      header->type = id;
      header->length = len;
!     header->group = TOS_AM_GROUP;
      return call SubSend.send(msg, len);
    }
--- 55,67 ----
  					  uint8_t len) {
      serial_header_t* header = getHeader(msg);
!     header->dest = dest;
!     // Do not set the source address or group, as doing so
!     // prevents transparent bridging. Need a better long-term
!     // solution for this.
!     //header->src = call AMPacket.address();
!     //header->group = TOS_AM_GROUP;
      header->type = id;
      header->length = len;
! 
      return call SubSend.send(msg, len);
    }
***************
*** 129,138 ****
    command am_addr_t AMPacket.destination(message_t* amsg) {
      serial_header_t* header = getHeader(amsg);
!     return header->addr;
    }
  
    command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
      serial_header_t* header = getHeader(amsg);
!     header->addr = addr;
    }
    
--- 134,153 ----
    command am_addr_t AMPacket.destination(message_t* amsg) {
      serial_header_t* header = getHeader(amsg);
!     return header->dest;
!   }
! 
!   command am_addr_t AMPacket.source(message_t* amsg) {
!     serial_header_t* header = getHeader(amsg);
!     return header->src;
    }
  
    command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
      serial_header_t* header = getHeader(amsg);
!     header->dest = addr;
!   }
!   
!   command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
!     serial_header_t* header = getHeader(amsg);
!     header->src = addr;
    }