X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf230%2FRF230LayerP.nc;h=b2a9bb4921d7f71e218ad1de2976dadef1cf3327;hb=767ff6e033b60d786e7fe0936cf387be52bc68d3;hp=1485d226d8e23e092c2db96e854cd1de38b581d6;hpb=963fc08bb8df6e1466480985c8b2dda65283e287;p=tinyos-2.x.git

diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF230LayerP.nc
index 1485d226..b2a9bb49 100644
--- a/tos/chips/rf230/RF230LayerP.nc
+++ b/tos/chips/rf230/RF230LayerP.nc
@@ -634,6 +634,7 @@ implementation
 		if( isSpiAcquired() )
 		{
 			uint16_t time;
+			uint32_t time32;
 			uint8_t irq;
 			uint8_t temp;
 			
@@ -713,7 +714,11 @@ implementation
 					 * CMD_TRANSMIT.
 					 */
 					if( irq == RF230_IRQ_RX_START ) // just to be cautious
-						call PacketTimeStamp.set(rxMsg, time - RX_SFD_DELAY);
+					{
+						time32 = call LocalTime.get();
+						time32 += (int16_t)(time - RX_SFD_DELAY) - (int16_t)(time32);
+						call PacketTimeStamp.set(rxMsg, time32);
+					}
 					else
 						call PacketTimeStamp.clear(rxMsg);