Changeset 1164

Timestamp:

09/12/11 15:52:56 (21 months ago)

Author:

thomas

Message:

selecting the neighbor to sync with is done before calling the synchronize* functions. Partically fixes #92.

Location:

firmware/openos/openwsn

Files:

• 02a-MAC/IEEE802154E.c (modified) (7 diffs)
• 02b-RES/neighbors.c (modified) (2 diffs)

firmware/openos/openwsn/02a-MAC/IEEE802154E.c

@@ -88 +88 @@
 uint16_t asnRead (OpenQueueEntry_t* advFrame);
 // synchronization
-void     synchronizePacket(uint16_t timeReceived, open_addr_t* advFrom);
-void     synchronizeAck(int16_t timeCorrection, open_addr_t* advFrom);
+void     synchronizePacket(uint16_t timeReceived);
+void     synchronizeAck(int16_t timeCorrection);
 void     changeIsSync(bool newIsSync);
 // notifying upper layer
@@ -470 +470 @@
          
          // synchronize (for the first time) to the sender's ADV
-         synchronizePacket(ieee154e_vars.syncCapturedTime,&(ieee154e_vars.dataReceived->l2_nextORpreviousHop));
+         synchronizePacket(ieee154e_vars.syncCapturedTime);
          
          // declare synchronized
@@ -890 +890 @@
       if (isValidAck(&ieee802514_header,ieee154e_vars.dataToSend)==TRUE) {
          
-         // resynchronize
-         timeCorrection = (int16_t)(ieee154e_vars.ackReceived->payload[1]<<8 | ieee154e_vars.ackReceived->payload[0]);
-         synchronizeAck(timeCorrection,&(ieee154e_vars.ackReceived->l2_nextORpreviousHop));
+         // resynchronize if I'm not a DAGroot and ACK from preferred parent
+         if (idmanager_getIsDAGroot()==FALSE &&
+             neighbors_isPreferredParent(&(ieee154e_vars.ackReceived->l2_nextORpreviousHop)) ) {
+            timeCorrection = (int16_t)(ieee154e_vars.ackReceived->payload[1]<<8 | ieee154e_vars.ackReceived->payload[0]);
+            synchronizeAck(timeCorrection);
+         }
          
          // inform upper layer
@@ -1083 +1086 @@
          ieee154etimer_schedule(DURATION_rt5);
       } else {
-         // synchronize to the received packet
-         synchronizePacket(ieee154e_vars.syncCapturedTime,&(ieee154e_vars.dataReceived->l2_nextORpreviousHop));
+         // synchronize to the received packet iif I'm not a DAGroot and this is my preferred parent
+         if (idmanager_getIsDAGroot()==FALSE && neighbors_isPreferredParent(&(ieee154e_vars.dataReceived->l2_nextORpreviousHop))) {
+            synchronizePacket(ieee154e_vars.syncCapturedTime);
+         }
          // indicate reception to upper layer (no ACK asked)
          notif_receive(ieee154e_vars.dataReceived);
@@ -1251 +1256 @@
    
    // synchronize to the received packet
-   synchronizePacket(ieee154e_vars.syncCapturedTime,&(ieee154e_vars.dataReceived->l2_nextORpreviousHop));
+   if (idmanager_getIsDAGroot()==FALSE && neighbors_isPreferredParent(&(ieee154e_vars.dataReceived->l2_nextORpreviousHop))) {
+      synchronizePacket(ieee154e_vars.syncCapturedTime);
+   }
    
    // inform upper layer of reception (after ACK sent)
@@ -1349 +1356 @@
 //======= synchronization
 
-void synchronizePacket(uint16_t timeReceived,open_addr_t* advFrom) {
+void synchronizePacket(uint16_t timeReceived) {
    int16_t  timeCorrection;
    uint16_t newTaccr0;
@@ -1357 +1364 @@
    currentTar           =  TAR;
    currentTaccr0        =  TACCR0;
-   // only resynchronize if I'm not a DAGroot and this is my preferred parent
-   if (idmanager_getIsDAGroot()==FALSE && neighbors_isPreferredParent(advFrom)) {
-      timeCorrection    =  (int16_t)((int16_t)timeReceived-(int16_t)TsTxOffset);
-      newTaccr0         =  TsSlotDuration;
-      // detect whether I'm too close to the edge of the slot, in that case,
-      // skip a slot and increase the temporary slot length to be 2 slots long
-      if (currentTar<timeReceived ||
-          currentTaccr0-currentTar<RESYNCHRONIZATIONGUARD) {
-         DEBUG_PIN_SLOT_TOGGLE();
-         TACTL         &= ~TAIFG;
-         newTaccr0     +=  TsSlotDuration;
-         ieee154e_vars.asn++;
-         DEBUG_PIN_SLOT_TOGGLE();
-      }
-      newTaccr0         =  (uint16_t)((int16_t)newTaccr0+timeCorrection);
-      TACCR0            =  newTaccr0;
-      ieee154e_vars.deSyncTimeout = DESYNCTIMEOUT;
-      // update statistics
-      updateStats(timeCorrection);
-   }
-}
-
-void synchronizeAck(int16_t timeCorrection,open_addr_t* advFrom) {
+   // calculate new value for TACCR0
+   timeCorrection    =  (int16_t)((int16_t)timeReceived-(int16_t)TsTxOffset);
+   newTaccr0         =  TsSlotDuration;
+   // detect whether I'm too close to the edge of the slot, in that case,
+   // skip a slot and increase the temporary slot length to be 2 slots long
+   if (currentTar<timeReceived ||
+       currentTaccr0-currentTar<RESYNCHRONIZATIONGUARD) {
+      DEBUG_PIN_SLOT_TOGGLE();
+      TACTL         &= ~TAIFG;
+      newTaccr0     +=  TsSlotDuration;
+      ieee154e_vars.asn++;
+      DEBUG_PIN_SLOT_TOGGLE();
+   }
+   newTaccr0         =  (uint16_t)((int16_t)newTaccr0+timeCorrection);
+   TACCR0            =  newTaccr0;
+   ieee154e_vars.deSyncTimeout = DESYNCTIMEOUT;
+   // update statistics
+   updateStats(timeCorrection);
+}
+
+void synchronizeAck(int16_t timeCorrection) {
    uint16_t newTaccr0;
    uint16_t currentTaccr0;
-   // record the current states of the TAR and TACCR0 registers
+   // resynchronize
    currentTaccr0        =  TACCR0;
-   // only resynchronize if I'm not a DAGroot and this is my preferred parent
-   if (idmanager_getIsDAGroot()==FALSE && neighbors_isPreferredParent(advFrom)) {
-      newTaccr0         =  (uint16_t)((int16_t)currentTaccr0-timeCorrection);
-      TACCR0            =  newTaccr0;
-      ieee154e_vars.deSyncTimeout = DESYNCTIMEOUT;
-      // update statistics
-      updateStats(timeCorrection);
-   }
+   newTaccr0         =  (uint16_t)((int16_t)currentTaccr0-timeCorrection);
+   TACCR0            =  newTaccr0;
+   ieee154e_vars.deSyncTimeout = DESYNCTIMEOUT;
+   // update statistics
+   updateStats(timeCorrection);
 }
 

firmware/openos/openwsn/02b-RES/neighbors.c

@@ -199 +199 @@
 
 __monitor bool neighbors_isPreferredParent(open_addr_t* address) {
-   return TRUE; //poipoipoipoi
+   return TRUE; // poipoipoi
+   /*
    uint8_t i;
    for (i=0;i<MAXNUMNEIGHBORS;i++) {
@@ -207 +208 @@
    }
    return FALSE;
+   */
 }