fix the max packet length assert

[tinyos-2.x.git] / tos / chips / rf2xx / rf230 / RF230DriverLayerP.nc

diff --git a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
index 22c969cb8b904ee830f1f57ec21aed5b4de753f2..b1a2670e54654fa37b533e705417711c5bb69720 100644 (file)
--- a/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
+++ b/tos/chips/rf2xx/rf230/RF230DriverLayerP.nc
@@ -458,7 +458,7 @@ implementation
                atomic
                {
                        call SLP_TR.set();
-                       time = call RadioAlarm.getNow() + TX_SFD_DELAY;
+                       time = call RadioAlarm.getNow();
                }
                call SLP_TR.clr();
 #endif
@@ -493,12 +493,12 @@ implementation
                atomic
                {
                        call SLP_TR.set();
-                       time = call RadioAlarm.getNow() + TX_SFD_DELAY;
+                       time = call RadioAlarm.getNow();
                }
                call SLP_TR.clr();
 #endif
 
-               time32 += (int16_t)(time) - (int16_t)(time32);
+               time32 += (int16_t)(time + TX_SFD_DELAY) - (int16_t)(time32);
 
                if( timesync != 0 )
                        *(timesync_relative_t*)timesync = (*(timesync_absolute_t*)timesync) - time32;
@@ -880,7 +880,7 @@ implementation
 
        async command uint8_t RadioPacket.maxPayloadLength()
        {
-               ASSERT( call Config.maxPayloadLength() <= 125 );
+               ASSERT( call Config.maxPayloadLength() - sizeof(rf230_header_t) <= 125 );
 
                return call Config.maxPayloadLength() - sizeof(rf230_header_t);
        }