thomas's FTSP patch

diff --git a/tos/chips/cc2420/csma/CC2420CsmaP.nc b/tos/chips/cc2420/csma/CC2420CsmaP.nc
index c0d5ef37e8972991536570b0fc1287251bb4d317..e67f921763774af7c11d0e2492e7a9973083b020 100644 (file)
--- a/tos/chips/cc2420/csma/CC2420CsmaP.nc
+++ b/tos/chips/cc2420/csma/CC2420CsmaP.nc
@@ -143,7 +143,7 @@ implementation {
     metadata->ack = FALSE;
     metadata->rssi = 0;
     metadata->lqi = 0;
-    metadata->timesync = FALSE;
+    //metadata->timesync = FALSE;
     metadata->timestamp = CC2420_INVALID_TIMESTAMP;
 
     ccaOn = TRUE;

diff --git a/tos/chips/cc2420/transmit/CC2420TransmitP.nc b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
index 7462c9b26c09eb3d051d0a315b8d1326297b3053..a8367e54c99f0342df952fd65fda1dc59baf2e5c 100644 (file)
--- a/tos/chips/cc2420/transmit/CC2420TransmitP.nc
+++ b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
@@ -278,6 +278,8 @@ implementation {
            call CSN.clr();
            call TXFIFO_RAM.write( absOffset, (uint8_t*)timesync, sizeof(timesync_radio_t) );
            call CSN.set();
+           //restoring the event time to the original value
+           *timesync  += time32;
         }
 
         if ( (call CC2420PacketBody.getHeader( m_msg ))->fcf & ( 1 << IEEE154_FCF_ACK_REQ ) ) {

diff --git a/tos/chips/msp430/timer/Msp430TimerCapComP.nc b/tos/chips/msp430/timer/Msp430TimerCapComP.nc
index 548aecc301f9918be6d1f178f1a9d3871433008d..52355369c72ac061da5169356856f51e9594088c 100644 (file)
--- a/tos/chips/msp430/timer/Msp430TimerCapComP.nc
+++ b/tos/chips/msp430/timer/Msp430TimerCapComP.nc
@@ -65,7 +65,7 @@ implementation
       ccis : 0,  // capture/compare input select
       clld : 0,  // TBCL1 loads on write to TBCCR1
       cap : 1,   // compare mode
-      scs : 1,   // synchronous capture mode
+      scs : 0,   // non synchronous capture mode
       ccie : 0,  // capture compare interrupt enable
     };
     return CC2int(x);