From: R. Steve McKown <rsmckown@gmail.com>
Date: Tue, 25 Aug 2009 03:13:21 +0000 (-0600)
Subject: Backport change from CVS for getTime32() in CC2420TransmitP.
X-Git-Tag: patchset/2.1.1-4.5~10
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=5d774627c6a5f959045751f9d354257b8928313d

Backport change from CVS for getTime32() in CC2420TransmitP.
---

diff --git a/tos/chips/cc2420/transmit/CC2420TransmitP.nc b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
index 87898e2c..7e12cec8 100644
--- a/tos/chips/cc2420/transmit/CC2420TransmitP.nc
+++ b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
@@ -258,8 +258,9 @@ implementation {
   
   inline uint32_t getTime32(uint16_t time)
   {
-    uint32_t recent_time=call BackoffTimer.getNow();
-    return recent_time + (int16_t)(time - recent_time);
+    uint32_t recent_time = call BackoffTimer.getNow();
+
+    return recent_time - (uint16_t)(recent_time - time);
   }
 
   /**