[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/cc2420_tkn154 CaptureTime.nc, 1.1, 1.2 CC2420ControlP.nc, 1.2, 1.3 CC2420ControlTransmitC.nc, 1.3, 1.4 CC2420Power.nc, 1.2, 1.3 CC2420ReceiveC.nc, 1.1, 1.2 CC2420Receive.nc, 1.1, 1.2 CC2420ReceiveP.nc, 1.2, 1.3 CC2420Rx.nc, 1.1, 1.2 CC2420TKN154C.nc, 1.1, 1.2 CC2420TKN154P.nc, 1.2, 1.3 CC2420TransmitP.nc, 1.3, 1.4 CC2420Tx.nc, 1.2, 1.3 ReferenceTime.nc, 1.1, 1.2 ReliableWait.nc, 1.2, 1.3 Timestamp.nc, 1.1, 1.2

Jan-Hinrich Hauer janhauer at users.sourceforge.net
Wed Mar 4 10:32:14 PST 2009 

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17605/tos/chips/cc2420_tkn154

Modified Files:
	CaptureTime.nc CC2420ControlP.nc CC2420ControlTransmitC.nc 
	CC2420Power.nc CC2420ReceiveC.nc CC2420Receive.nc 
	CC2420ReceiveP.nc CC2420Rx.nc CC2420TKN154C.nc 
	CC2420TKN154P.nc CC2420TransmitP.nc CC2420Tx.nc 
	ReferenceTime.nc ReliableWait.nc Timestamp.nc 
Log Message:
- re-designed the radio driver interfaces, restructured/improved the CC2420 radio driver
- split the main MAC configuration (was TKN154P.nc) in two: one for beacon-enabled mode the other for nonbeacon-enabled mode (this decision has to be made at compile time now)
- added (serial) debugging functions (compile with "TKN154_DEBUG=1 make telosb" and use the java PrintfClient, see tinyos-2.x/apps/tests/TestPrintf/README.txt)
- improved readability, added comments 

Index: CaptureTime.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CaptureTime.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CaptureTime.nc	16 Jun 2008 18:02:40 -0000	1.1
--- CaptureTime.nc	4 Mar 2009 18:31:00 -0000	1.2
***************
*** 39,43 ****
     * @param   localTime capture time converted to local time + offset symbols
     * @param   offset time in symbols (16 us) to add to capture time
     */
!   async command void convert(uint16_t time, ieee154_reftime_t *localTime, int16_t offset);
  }
--- 39,57 ----
     * @param   localTime capture time converted to local time + offset symbols
     * @param   offset time in symbols (16 us) to add to capture time
+    * @return  SUCCESS if conversion was made successfully, FAIL otherwise
     */
!   async command error_t convert(uint16_t time, ieee154_timestamp_t *localTime, int16_t offset);
! 
!   /**
!    * Tells whether the timestamp is valid. On the CC2420 an SFD transition
!    * does not necessarily mean that the packet is put in the RXFIFO.
!    * This command should return FALSE iff the time between the rising SFD
!    * and the falling SFD is too short for the smallest possible frame, i.e.
!    * ACK frame (see CC2420 datasheet for details on SFD timing).
!    *
!    * @param  risingSFDTime capture time of rising SFD
!    * @param  fallingSFDTime capture time of falling SFD
!    * @return FALSE if time offset is too small for a valid packet
!    */
!   async command bool isValidTimestamp(uint16_t risingSFDTime, uint16_t fallingSFDTime);
  }

Index: CC2420ControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ControlP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420ControlP.nc	25 Nov 2008 09:35:08 -0000	1.2
--- CC2420ControlP.nc	4 Mar 2009 18:31:03 -0000	1.3
***************
*** 74,81 ****
    uses interface CC2420Register as TXCTRL;
    uses interface AMPacket;
-   
    uses interface Resource as SpiResource;
- 
-   uses interface Leds;
    uses interface FrameUtility;
  }
--- 74,78 ----
***************
*** 291,295 ****
          // issuing the SFLUSHRX command strobe" (CC2420 Datasheet)
          call CSN.clr();
!         call RXFIFO_REGISTER.read(&dummy); // reading 1 byte would be enough...
          call CSN.set();
          call CSN.clr();
--- 288,292 ----
          // issuing the SFLUSHRX command strobe" (CC2420 Datasheet)
          call CSN.clr();
!         call RXFIFO_REGISTER.read(&dummy); // reading the byte
          call CSN.set();
          call CSN.clr();
***************
*** 399,402 ****
--- 396,400 ----
      atomic return m_needsSync;
    }
+ 
    /**
     * Sync must be called to commit software parameters configured on

Index: CC2420ControlTransmitC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ControlTransmitC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CC2420ControlTransmitC.nc	25 Nov 2008 09:35:08 -0000	1.3
--- CC2420ControlTransmitC.nc	4 Mar 2009 18:31:04 -0000	1.4
***************
*** 65,69 ****
      interface CaptureTime;
      interface ReferenceTime;
-     interface Leds;
    }
  }
--- 65,68 ----
***************
*** 77,81 ****
    CC2420Power = CC2420ControlP;
    FrameUtility = CC2420ControlP;
-   CC2420ControlP.Leds = Leds;
  
    components MainC;
--- 76,79 ----
***************
*** 120,124 ****
    CaptureTime = CC2420TransmitP;
    ReferenceTime = CC2420TransmitP;
-   CC2420TransmitP.Leds = Leds;
  
    MainC.SoftwareInit -> CC2420TransmitP;
--- 118,121 ----
***************
*** 127,130 ****
--- 124,129 ----
    CC2420TransmitP.SFD -> Pins.SFD;
    CC2420TransmitP.CaptureSFD -> Interrupts.CaptureSFD;
+   CC2420TransmitP.FIFOP -> Pins.FIFOP;
+   CC2420TransmitP.FIFO -> Pins.FIFO;
  
    CC2420TransmitP.ChipSpiResource -> Spi;

Index: CC2420Power.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420Power.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420Power.nc	25 Nov 2008 09:35:08 -0000	1.2
--- CC2420Power.nc	4 Mar 2009 18:31:04 -0000	1.3
***************
*** 100,104 ****
    /**
     * Read RSSI from the radio. 
!    * @return SUCCESS if RSSI was read successfulyy, FAIL otherwise.
     */
    async command error_t rssi(int8_t *rssi);
--- 100,104 ----
    /**
     * Read RSSI from the radio. 
!    * @return SUCCESS if RSSI was read successfully, FAIL otherwise.
     */
    async command error_t rssi(int8_t *rssi);

Index: CC2420ReceiveC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ReceiveC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420ReceiveC.nc	16 Jun 2008 18:02:40 -0000	1.1
--- CC2420ReceiveC.nc	4 Mar 2009 18:31:04 -0000	1.2
***************
*** 44,48 ****
    provides interface CC2420Rx;      // to the driver
    uses interface ReferenceTime;
-   uses interface Leds;
    uses interface FrameUtility;
    uses interface CC2420Config;
--- 44,47 ----
***************
*** 57,61 ****
    components HplCC2420InterruptsC as InterruptsC;
  
-   CC2420ReceiveP.Leds = Leds;
    CC2420AsyncSplitControl = CC2420ReceiveP;
    CC2420Receive = CC2420ReceiveP;
--- 56,59 ----

Index: CC2420Receive.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420Receive.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420Receive.nc	16 Jun 2008 18:02:40 -0000	1.1
--- CC2420Receive.nc	4 Mar 2009 18:31:06 -0000	1.2
***************
*** 46,50 ****
     * @param time at which the capture happened.
     */
!   async command void sfd( ieee154_reftime_t *time );
  
    /**
--- 46,50 ----
     * @param time at which the capture happened.
     */
!   async command void sfd( ieee154_timestamp_t *time );
  
    /**

Index: CC2420ReceiveP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420ReceiveP.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420ReceiveP.nc	25 Nov 2008 09:35:08 -0000	1.2
--- CC2420ReceiveP.nc	4 Mar 2009 18:31:06 -0000	1.3
***************
*** 60,65 ****
    uses interface CC2420Config;
    uses interface CC2420Ram as RXFIFO_RAM;
-   
-   uses interface Leds;
  }
  
--- 60,63 ----
***************
*** 83,88 ****
    };
  
!   ieee154_reftime_t m_timestamp_queue[ TIMESTAMP_QUEUE_SIZE ];
!   ieee154_reftime_t m_timestamp;
    norace bool m_timestampValid;
    
--- 81,86 ----
    };
  
!   ieee154_timestamp_t m_timestamp_queue[ TIMESTAMP_QUEUE_SIZE ];
!   ieee154_timestamp_t m_timestamp;
    norace bool m_timestampValid;
    
***************
*** 157,164 ****
          return FAIL; 
        }
!       if (m_state != S_STOPPED){
!         call Leds.led0On();
!         return FAIL;
!       }
        reset_state();
        m_state = S_STARTED;
--- 155,159 ----
          return FAIL; 
        }
!       ASSERT(m_state == S_STOPPED);
        reset_state();
        m_state = S_STARTED;
***************
*** 210,215 ****
    task void stopContinueTask()
    {
!     if (receivingPacket)
!       call Leds.led0On();
      call SpiResource.release(); // may fail
      atomic m_state = S_STOPPED;
--- 205,209 ----
    task void stopContinueTask()
    {
!     ASSERT(receivingPacket != TRUE);
      call SpiResource.release(); // may fail
      atomic m_state = S_STOPPED;
***************
*** 245,249 ****
     * See the CC2420 datasheet for details.
     */
!   async command void CC2420Receive.sfd( ieee154_reftime_t *time ) {
      if (m_state == S_STOPPED)
        return;
--- 239,243 ----
     * See the CC2420 datasheet for details.
     */
!   async command void CC2420Receive.sfd( ieee154_timestamp_t *time ) {
      if (m_state == S_STOPPED)
        return;
***************
*** 251,255 ****
        uint8_t tail =  ( ( m_timestamp_head + m_timestamp_size ) % 
                          TIMESTAMP_QUEUE_SIZE );
!       memcpy(&m_timestamp_queue[ tail ], time, sizeof(ieee154_reftime_t) );
        m_timestamp_size++;
      }
--- 245,249 ----
        uint8_t tail =  ( ( m_timestamp_head + m_timestamp_size ) % 
                          TIMESTAMP_QUEUE_SIZE );
!       memcpy(&m_timestamp_queue[ tail ], time, sizeof(ieee154_timestamp_t) );
        m_timestamp_size++;
      }
***************
*** 282,289 ****
        switch (m_state)
        {
!         case S_STOPPED: // this should never happen!
!                         call Leds.led0On(); 
!                         call SpiResource.release(); 
!                         break;
          default: receive();
        }
--- 276,280 ----
        switch (m_state)
        {
!         case S_STOPPED: ASSERT(0); break; // this should never happen!
          default: receive();
        }
***************
*** 409,415 ****
        
        if ( m_timestamp_size ) {
!         if ( rxFrameLength > 10 ) {
            //((ieee154_metadata_t*) m_rxFramePtr->metadata)->timestamp = m_timestamp_queue[ m_timestamp_head ];
!           memcpy(&m_timestamp, &m_timestamp_queue[ m_timestamp_head ], sizeof(ieee154_reftime_t) );
            m_timestampValid = TRUE;
            m_timestamp_head = ( m_timestamp_head + 1 ) % TIMESTAMP_QUEUE_SIZE;
--- 400,406 ----
        
        if ( m_timestamp_size ) {
!         if ( rxFrameLength > 4 ) {
            //((ieee154_metadata_t*) m_rxFramePtr->metadata)->timestamp = m_timestamp_queue[ m_timestamp_head ];
!           memcpy(&m_timestamp, &m_timestamp_queue[ m_timestamp_head ], sizeof(ieee154_timestamp_t) );
            m_timestampValid = TRUE;
            m_timestamp_head = ( m_timestamp_head + 1 ) % TIMESTAMP_QUEUE_SIZE;
***************
*** 466,475 ****
      ieee154_metadata_t *metadata = (ieee154_metadata_t*) m_rxFramePtr->metadata;
  
!     atomic {
!       if (m_state == S_STOPPED){
!         call Leds.led0On();
!         return;
!       }
!     }
      ((ieee154_header_t*) m_rxFramePtr->header)->length = m_rxFramePtr->data[payloadLen+1] & 0x7f; // temp. LQI
      metadata->rssi = m_rxFramePtr->data[payloadLen];
--- 457,461 ----
      ieee154_metadata_t *metadata = (ieee154_metadata_t*) m_rxFramePtr->metadata;
  
!     atomic ASSERT(m_state != S_STOPPED);
      ((ieee154_header_t*) m_rxFramePtr->header)->length = m_rxFramePtr->data[payloadLen+1] & 0x7f; // temp. LQI
      metadata->rssi = m_rxFramePtr->data[payloadLen];

Index: CC2420Rx.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420Rx.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420Rx.nc	16 Jun 2008 18:02:40 -0000	1.1
--- CC2420Rx.nc	4 Mar 2009 18:31:07 -0000	1.2
***************
*** 43,47 ****
     * component to use for the next reception. 
     */
!   event message_t* received(message_t *data, ieee154_reftime_t *timestamp);
  
  }
--- 43,47 ----
     * component to use for the next reception. 
     */
!   event message_t* received(message_t *data, ieee154_timestamp_t *timestamp);
  
  }

Index: CC2420TKN154C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420TKN154C.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CC2420TKN154C.nc	16 Jun 2008 18:02:40 -0000	1.1
--- CC2420TKN154C.nc	4 Mar 2009 18:31:07 -0000	1.2
***************
*** 42,49 ****
--- 42,52 ----
      interface RadioRx;
      interface RadioTx;
+     interface SlottedCsmaCa;
+     interface UnslottedCsmaCa;
      interface EnergyDetection;
      interface RadioOff;
      interface Set<bool> as RadioPromiscuousMode;
      interface Timestamp;
+     interface GetNow<bool> as CCA;
    } uses {
      interface Notify<const void*> as PIBUpdate[uint8_t attributeID];
***************
*** 56,60 ****
      interface ReliableWait;
      interface TimeCalc;
-     interface Leds;
      interface Random;
    }
--- 59,62 ----
***************
*** 66,69 ****
--- 68,73 ----
    RadioRx = PHY;
    RadioTx = PHY;
+   SlottedCsmaCa = PHY;
+   UnslottedCsmaCa = PHY;
    RadioOff = PHY;
    EnergyDetection = PHY;
***************
*** 75,81 ****
    ReferenceTime = PHY;
    TimeCalc = PHY;
  
    PHY.Random = Random;
-   Leds = PHY.Leds;
  
    components CC2420ControlTransmitC;
--- 79,85 ----
    ReferenceTime = PHY;
    TimeCalc = PHY;
+   CCA = PHY;
  
    PHY.Random = Random;
  
    components CC2420ControlTransmitC;
***************
*** 85,89 ****
    CC2420ControlTransmitC.StartupAlarm = Alarm2;
    FrameUtility = CC2420ControlTransmitC;
-   Leds = CC2420ControlTransmitC;
  
    PHY.TxControl -> CC2420ControlTransmitC;
--- 89,92 ----
***************
*** 97,101 ****
    PHY.CC2420Rx -> CC2420ReceiveC.CC2420Rx;
    ReferenceTime = CC2420ReceiveC;
-   Leds = CC2420ReceiveC;
    FrameUtility = CC2420ReceiveC;
    CC2420ReceiveC.CC2420Config -> CC2420ControlTransmitC;
--- 100,103 ----

Index: CC2420TKN154P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420TKN154P.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420TKN154P.nc	25 Nov 2008 09:35:08 -0000	1.2
--- CC2420TKN154P.nc	4 Mar 2009 18:31:07 -0000	1.3
***************
*** 44,53 ****
    provides {
      interface SplitControl;
      interface RadioRx;
      interface RadioTx;
!     interface RadioOff;
      interface EnergyDetection;
      interface Set<bool> as RadioPromiscuousMode;
      interface Timestamp;
    } uses {
      interface Notify<const void*> as PIBUpdate[uint8_t attributeID];
[...1417 lines suppressed...]
      }
    }
  
+   async command bool CCA.getNow()
+   {
+     return call CC2420Tx.cca();
+   }
  
!   default event void SplitControl.startDone(error_t error) {}
!   default event void SplitControl.stopDone(error_t error) {}
!   
!   default async event void UnslottedCsmaCa.transmitDone(ieee154_txframe_t *frame, 
!       ieee154_csma_t *csma, bool ackPendingFlag, error_t result) {}
!   default async event void SlottedCsmaCa.transmitDone(ieee154_txframe_t *frame, ieee154_csma_t *csma, 
!       bool ackPendingFlag,  uint16_t remainingBackoff, error_t result) {}
! 
!   default async event void Timestamp.transmissionStarted(uint8_t frameType, uint8_t msduHandle, uint8_t *msdu, uint8_t token) {}
!   default async event void Timestamp.transmittedSFD(uint32_t time, uint8_t frameType, uint8_t msduHandle, uint8_t *msdu, uint8_t token) {}
  }
  

Index: CC2420TransmitP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420TransmitP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CC2420TransmitP.nc	25 Nov 2008 09:35:08 -0000	1.3
--- CC2420TransmitP.nc	4 Mar 2009 18:31:11 -0000	1.4
***************
*** 60,63 ****
--- 60,65 ----
    uses interface GeneralIO as CSN;
    uses interface GeneralIO as SFD;
+   uses interface GeneralIO as FIFO;
+   uses interface GeneralIO as FIFOP;
  
    uses interface ChipSpiResource;
***************
*** 102,106 ****
    
    norace ieee154_txframe_t *m_frame;
!   ieee154_reftime_t m_timestamp;
    
    cc2420_transmit_state_t m_state = S_STOPPED;
--- 104,108 ----
    
    norace ieee154_txframe_t *m_frame;
!   ieee154_timestamp_t m_timestamp;
    
    cc2420_transmit_state_t m_state = S_STOPPED;
***************
*** 231,234 ****
--- 233,237 ----
        } else {
          m_state = S_SFD;
+         m_frame->metadata->timestamp = IEEE154_INVALID_TIMESTAMP; // pessimistic
          call BackoffAlarm.start(CC2420_ABORT_PERIOD); 
          return SUCCESS;
***************
*** 260,265 ****
          call CaptureSFD.captureFallingEdge();
          // timestamp denotes time of first bit (chip) of PPDU on the channel
!         call CaptureTime.convert(time, &m_timestamp, -10); // offset: -10 for 5 bytes (preamble+SFD)
!         m_frame->metadata->timestamp = call ReferenceTime.toLocalTime(&m_timestamp);
          call BackoffAlarm.stop();
          if ( call SFD.get() ) {
--- 263,269 ----
          call CaptureSFD.captureFallingEdge();
          // timestamp denotes time of first bit (chip) of PPDU on the channel
!         // offset: -10 for 5 bytes (preamble+SFD)
!         if (call CaptureTime.convert(time, &m_timestamp, -10) == SUCCESS) 
!           m_frame->metadata->timestamp = call ReferenceTime.toLocalTime(&m_timestamp);
          call BackoffAlarm.stop();
          if ( call SFD.get() ) {
***************
*** 290,293 ****
--- 294,298 ----
          
        default:
+         // The CC2420 is in receive mode.
          if ( !m_receiving ) {
            sfdHigh = TRUE;
***************
*** 307,317 ****
          call CaptureSFD.captureRisingEdge();
          m_receiving = FALSE;
! #ifdef TKN154_PIERCEBOARD
!         if ( time - m_prev_time < 10*30 ) {
! #else
!         if ( time - m_prev_time < 10 ) {
! #endif
            call CC2420Receive.sfd_dropped();
-         }
          break;
        
--- 312,317 ----
          call CaptureSFD.captureRisingEdge();
          m_receiving = FALSE;
!         if (!call CaptureTime.isValidTimestamp(m_prev_time, time))
            call CC2420Receive.sfd_dropped();
          break;
        
***************
*** 398,403 ****
  
    void signalDone( bool ackFramePending, error_t err ) {
      atomic m_state = S_STARTED;
!     signal CC2420Tx.sendDone( m_frame, &m_timestamp, ackFramePending, err );
      call ChipSpiResource.attemptRelease();
    }
--- 398,406 ----
  
    void signalDone( bool ackFramePending, error_t err ) {
+     ieee154_timestamp_t *txTime = &m_timestamp;
      atomic m_state = S_STARTED;
!     if (m_frame->metadata->timestamp == IEEE154_INVALID_TIMESTAMP)
!       txTime = NULL;
!     signal CC2420Tx.sendDone( m_frame, txTime, ackFramePending, err );
      call ChipSpiResource.attemptRelease();
    }

Index: CC2420Tx.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/CC2420Tx.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CC2420Tx.nc	25 Nov 2008 09:35:08 -0000	1.2
--- CC2420Tx.nc	4 Mar 2009 18:31:12 -0000	1.3
***************
*** 42,46 ****
  
    async command error_t send(bool cca);
!   async event void sendDone(ieee154_txframe_t *frame, ieee154_reftime_t *referenceTime, 
        bool ackPendingFlag, error_t error);
  
--- 42,46 ----
  
    async command error_t send(bool cca);
!   async event void sendDone(ieee154_txframe_t *frame, ieee154_timestamp_t *referenceTime, 
        bool ackPendingFlag, error_t error);
  

Index: ReferenceTime.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/ReferenceTime.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ReferenceTime.nc	16 Jun 2008 18:02:40 -0000	1.1
--- ReferenceTime.nc	4 Mar 2009 18:31:12 -0000	1.2
***************
*** 34,44 ****
  {
    /** 
!    * Gets current reference time plus dt symbols.
     */
!   async command void getNow(ieee154_reftime_t* reftime, uint16_t dt);
  
    /** 
     * Converts reference time to local time.
     */
!   async command uint32_t toLocalTime(ieee154_reftime_t* refTime);
  }
--- 34,44 ----
  {
    /** 
!    * Gets current time and adds dt symbols.
     */
!   async command void getNow(ieee154_timestamp_t* time, uint16_t dt);
  
    /** 
     * Converts reference time to local time.
     */
!   async command uint32_t toLocalTime(const ieee154_timestamp_t* time);
  }

Index: ReliableWait.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/ReliableWait.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReliableWait.nc	25 Nov 2008 09:35:08 -0000	1.2
--- ReliableWait.nc	4 Mar 2009 18:31:12 -0000	1.3
***************
*** 33,45 ****
  interface ReliableWait
  {
!   async command void busyWait(uint16_t dt);
!   async command void waitRx(ieee154_reftime_t *t0, uint16_t dt);
    async event void waitRxDone();
!   async command void waitTx(ieee154_reftime_t *t0, uint16_t dt);
    async event void waitTxDone();
!   async command void waitBackoff(ieee154_reftime_t *t0, uint16_t dt);
    async event void waitBackoffDone();
! 
!   async command void busyWaitSlotBoundaryCCA(ieee154_reftime_t *t0, uint16_t *dt);
!   async command void busyWaitSlotBoundaryTx(ieee154_reftime_t *t0, uint16_t dt);
  }
--- 33,42 ----
  interface ReliableWait
  {
!   async command void waitRx(uint32_t t0, uint32_t dt);
    async event void waitRxDone();
!   async command void waitTx(ieee154_timestamp_t *t0, uint32_t dt);
    async event void waitTxDone();
!   async command void waitBackoff(uint32_t dt);
    async event void waitBackoffDone();
!   async command bool ccaOnBackoffBoundary(ieee154_timestamp_t *slot0);
  }

Index: Timestamp.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/cc2420_tkn154/Timestamp.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Timestamp.nc	16 Jun 2008 18:02:40 -0000	1.1
--- Timestamp.nc	4 Mar 2009 18:31:12 -0000	1.2
***************
*** 70,74 ****
     * Modify (overwrite) the contents of the MAC payload. This command must 
     * only be called in the context of a <code>transmittedSFD()<\code> event and it
!    * should return fast. Note: the smaller offset is the faster 
     * <code>transmittedSFD()<\code> must be finished (offset of zero might not work).
     *
--- 70,74 ----
     * Modify (overwrite) the contents of the MAC payload. This command must 
     * only be called in the context of a <code>transmittedSFD()<\code> event and it
!    * should return fast. Note: the smaller the offset is the faster 
     * <code>transmittedSFD()<\code> must be finished (offset of zero might not work).
     *

More information about the Tinyos-2-commits mailing list