[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tda5250/mac CsmaMacP.nc, 1.1.2.15, 1.1.2.16

[akoepke]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CsmaMacP.nc 
Log Message:
correct bug: Timer.getAlarm() can be smaller than Timer.getNow(),
although the timer is marked as running and no overflow occured. Prevent
extrem backoff values.


Index: CsmaMacP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tda5250/mac/CsmaMacP.nc,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -C2 -d -r1.1.2.15 -r1.1.2.16
*** CsmaMacP.nc	28 Nov 2006 12:11:19 -0000	1.1.2.15
--- CsmaMacP.nc	8 Dec 2006 14:24:07 -0000	1.1.2.16
***************
*** 108,112 ****
          TOKEN_ACK_MASK = 0x3f,
          INVALID_SNR = 0xffff,
!         MSG_TABLE_ENTRIES=5,
          MAX_AGE=2*MAX_LONG_RETRY*MAX_SHORT_RETRY,
      };
--- 108,112 ----
          TOKEN_ACK_MASK = 0x3f,
          INVALID_SNR = 0xffff,
!         MSG_TABLE_ENTRIES=20,
          MAX_AGE=2*MAX_LONG_RETRY*MAX_SHORT_RETRY,
      };
***************
*** 331,334 ****
--- 331,337 ----
                  restLaufzeit +=  MAXTIMERVALUE - now;
              }
+             if(restLaufzeit > BACKOFF_MASK) {
+                 restLaufzeit = backoff(0);
+             }
              setFlag(&flags, RESUME_BACKOFF);
          }