[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420 CC2420CsmaP.nc, 1.1.2.11, 1.1.2.12

[Jonathan Hui]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CC2420CsmaP.nc 
Log Message:

Don't override the ack bit. This was left in during debugging and
should have been removed.



Index: CC2420CsmaP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/CC2420CsmaP.nc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** CC2420CsmaP.nc	20 Jun 2006 18:56:04 -0000	1.1.2.11
--- CC2420CsmaP.nc	17 Jul 2006 05:04:16 -0000	1.1.2.12
***************
*** 163,172 ****
  
      header->length = len;
!     header->fcf = ( ( IEEE154_TYPE_DATA << IEEE154_FCF_FRAME_TYPE ) |
!                     ( 1 << IEEE154_FCF_INTRAPAN ) |
!                     ( IEEE154_ADDR_SHORT << IEEE154_FCF_DEST_ADDR_MODE ) |
!                     ( IEEE154_ADDR_SHORT << IEEE154_FCF_SRC_ADDR_MODE ) );
!     if ( header->dest != AM_BROADCAST_ADDR )
!       header->fcf |= 1 << IEEE154_FCF_ACK_REQ;
      header->src = call AMPacket.address();
      metadata->ack = FALSE;
--- 163,171 ----
  
      header->length = len;
!     header->fcf &= 1 << IEEE154_FCF_ACK_REQ;
!     header->fcf |= ( ( IEEE154_TYPE_DATA << IEEE154_FCF_FRAME_TYPE ) |
! 		     ( 1 << IEEE154_FCF_INTRAPAN ) |
! 		     ( IEEE154_ADDR_SHORT << IEEE154_FCF_DEST_ADDR_MODE ) |
! 		     ( IEEE154_ADDR_SHORT << IEEE154_FCF_SRC_ADDR_MODE ) );
      header->src = call AMPacket.address();
      metadata->ack = FALSE;