[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac DuplicateP.nc, 1.3, 1.4 Duplicate.nc, 1.1, 1.2 Duplicate.h, 1.1, 1.2

[akoepke]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3691/chips/tda5250/mac

Modified Files:
	DuplicateP.nc Duplicate.nc Duplicate.h 
Log Message:
include target address in fingerprint


Index: DuplicateP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/DuplicateP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DuplicateP.nc	27 Nov 2007 13:44:09 -0000	1.3
--- DuplicateP.nc	5 Mar 2008 11:19:50 -0000	1.4
***************
*** 57,64 ****
--- 57,66 ----
          sdDebug(3000 + last);
          sdDebug(dupOldest.src);
+         sdDebug(dupOldest.dest);
          sdDebug(dupOldest.seqno);
          sdDebug(dupOldest.age);
          sdDebug(4000);
          sdDebug(knownTable[last].src);
+         sdDebug(knownTable[last].dest);
          sdDebug(knownTable[last].seqno);
          sdDebug(knownTable[last].age);
***************
*** 93,97 ****
  
      /*** duplicate interface */
!     async command bool Duplicate.isNew(am_addr_t src, uint8_t seqno) {
          bool rVal = TRUE;
          unsigned i;
--- 95,99 ----
  
      /*** duplicate interface */
!     async command bool Duplicate.isNew(am_addr_t src, am_addr_t dest, uint8_t seqno) {
          bool rVal = TRUE;
          unsigned i;
***************
*** 99,102 ****
--- 101,105 ----
              if((knownTable[i].age < MAX_AGE) &&
                 (src == knownTable[i].src) &&
+                (dest == knownTable[i].dest) &&
                 (seqno == knownTable[i].seqno)) {
                  knownTable[i].age = 0;
***************
*** 110,114 ****
      }
      
!     async command void Duplicate.remember(am_addr_t src, uint8_t seqno) {
          unsigned oldest = findOldest();
  #ifdef DUPLICATE_DEBUG
--- 113,117 ----
      }
      
!     async command void Duplicate.remember(am_addr_t src, am_addr_t dest, uint8_t seqno) {
          unsigned oldest = findOldest();
  #ifdef DUPLICATE_DEBUG
***************
*** 118,121 ****
--- 121,125 ----
  #endif
          knownTable[oldest].src = src;
+         knownTable[oldest].dest = dest;
          knownTable[oldest].seqno = seqno;
          knownTable[oldest].age = 0;

Index: Duplicate.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/Duplicate.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Duplicate.nc	1 Oct 2007 15:48:59 -0000	1.1
--- Duplicate.nc	5 Mar 2008 11:19:50 -0000	1.2
***************
*** 36,43 ****
  interface Duplicate {
      /** check whether this message is a new message, does not store anything */
!     async command bool isNew(am_addr_t src, uint8_t seqno);
  
      /** remember the fingerprint of this message, stores/updates the information */
!     async command void remember(am_addr_t src, uint8_t seqno);
  }
  
--- 36,43 ----
  interface Duplicate {
      /** check whether this message is a new message, does not store anything */
!     async command bool isNew(am_addr_t src, am_addr_t dest, uint8_t seqno);
  
      /** remember the fingerprint of this message, stores/updates the information */
!     async command void remember(am_addr_t src, am_addr_t dest, uint8_t seqno);
  }
  

Index: Duplicate.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/Duplicate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Duplicate.h	1 Oct 2007 15:48:59 -0000	1.1
--- Duplicate.h	5 Mar 2008 11:19:50 -0000	1.2
***************
*** 37,40 ****
--- 37,41 ----
  typedef struct known_t {
      am_addr_t src;
+     am_addr_t dest;
      uint8_t seqno;
      uint8_t age;