[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc1000 CC1000ActiveMessageP.nc, 1.1.2.5, 1.1.2.6 CC1000Msg.h, 1.1.2.2, 1.1.2.3 CC1000SendReceiveP.nc, 1.1.2.16, 1.1.2.17

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CC1000ActiveMessageP.nc CC1000Msg.h CC1000SendReceiveP.nc 
Log Message:
Include source addresses in AM.


Index: CC1000ActiveMessageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000ActiveMessageP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** CC1000ActiveMessageP.nc	23 Apr 2006 21:59:22 -0000	1.1.2.5
--- CC1000ActiveMessageP.nc	4 Aug 2006 00:34:18 -0000	1.1.2.6
***************
*** 33,37 ****
   *
   * @author Philip Levis
!  * @date June 19 2005
   */
  
--- 33,37 ----
   *
   * @author Philip Levis
!  * @date June 19 2006
   */
  
***************
*** 61,65 ****
      cc1000_header_t* header = getHeader(amsg);
      header->type = id;
!     header->addr = addr;
      header->group = TOS_AM_GROUP;
      return call SubSend.send(amsg, len);
--- 61,66 ----
      cc1000_header_t* header = getHeader(amsg);
      header->type = id;
!     header->dest = addr;
!     header->source = call AMPacket.address();
      header->group = TOS_AM_GROUP;
      return call SubSend.send(amsg, len);
***************
*** 115,124 ****
    command am_addr_t AMPacket.destination(message_t* amsg) {
      cc1000_header_t* header = getHeader(amsg);
!     return header->addr;
    }
  
    command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
      cc1000_header_t* header = getHeader(amsg);
!     header->addr = addr;
    }
    
--- 116,135 ----
    command am_addr_t AMPacket.destination(message_t* amsg) {
      cc1000_header_t* header = getHeader(amsg);
!     return header->dest;
!   }
! 
!   command am_addr_t AMPacket.source(message_t* amsg) {
!     cc1000_header_t* header = getHeader(amsg);
!     return header->source;
    }
  
    command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
      cc1000_header_t* header = getHeader(amsg);
!     header->dest = addr;
!   }
! 
!   command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
!     cc1000_header_t* header = getHeader(amsg);
!     header->source = addr;
    }
    

Index: CC1000Msg.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000Msg.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** CC1000Msg.h	23 Apr 2006 21:59:22 -0000	1.1.2.2
--- CC1000Msg.h	4 Aug 2006 00:34:18 -0000	1.1.2.3
***************
*** 5,9 ****
  
  typedef nx_struct CC1KHeader {
!   nx_am_addr_t addr;
    nx_uint8_t length;
    nx_am_group_t group;
--- 5,10 ----
  
  typedef nx_struct CC1KHeader {
!   nx_am_addr_t dest;
!   nx_am_addr_t source;
    nx_uint8_t length;
    nx_am_group_t group;

Index: CC1000SendReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc1000/CC1000SendReceiveP.nc,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -C2 -d -r1.1.2.16 -r1.1.2.17
*** CC1000SendReceiveP.nc	21 Jun 2006 16:58:03 -0000	1.1.2.16
--- CC1000SendReceiveP.nc	4 Aug 2006 00:34:18 -0000	1.1.2.17
***************
*** 525,529 ****
      if (f.ack &&
  	rxFooter->crc &&
! 	rxHeader->addr == call amAddress())
        {
  	enterAckState();
--- 525,529 ----
      if (f.ack &&
  	rxFooter->crc &&
! 	rxHeader->dest == call amAddress())
        {
  	enterAckState();