[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420/receive CC2420ReceiveP.nc, 1.5, 1.6

[dmm]

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

Modified Files:
	CC2420ReceiveP.nc 
Log Message:
Fixed an edge case bug where the LQI takes on the RSSI value in the metadata when the payload is full.  Rearrange the metadata to store the bytes properly.

Index: CC2420ReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420/receive/CC2420ReceiveP.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CC2420ReceiveP.nc	14 Jan 2008 22:18:19 -0000	1.5
--- CC2420ReceiveP.nc	17 Jan 2008 15:19:27 -0000	1.6
***************
*** 325,330 ****
      
      metadata->crc = buf[ rxFrameLength ] >> 7;
-     metadata->rssi = buf[ rxFrameLength - 1 ];
      metadata->lqi = buf[ rxFrameLength ] & 0x7f;
      m_p_rx_buf = signal Receive.receive( m_p_rx_buf, m_p_rx_buf->data, 
                                           rxFrameLength );
--- 325,330 ----
      
      metadata->crc = buf[ rxFrameLength ] >> 7;
      metadata->lqi = buf[ rxFrameLength ] & 0x7f;
+     metadata->rssi = buf[ rxFrameLength - 1 ];
      m_p_rx_buf = signal Receive.receive( m_p_rx_buf, m_p_rx_buf->data, 
                                           rxFrameLength );