[Contiki-commits] contiki-2.x/core/dev cc2420.c,1.19,1.20

[bg <bg...@us...>]

Update of /cvsroot/contiki/contiki-2.x/core/dev
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12980

Modified Files:
	cc2420.c 
Log Message:
* Change max life of neigbour entries from 60 to 30 seconds by
  changing the time unit (quanta) from 4 to 2 seconds.


Index: cc2420.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/dev/cc2420.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** cc2420.c	1 Jun 2007 14:37:02 -0000	1.19
--- cc2420.c	28 Jun 2007 15:08:53 -0000	1.20
***************
*** 561,570 ****
  
  /*
!  * Expiration timestamps are 4-bits wide, in units of 4 seconds, and
   * relative to cc2420_check_remote::toff.
   */
! #define SCALE_DIV_EXPIRE    4
! #define MAX_EXPIRE         15
! #define AGE_INTERVAL        5	/* 20 seconds */
  
  struct cc2420_neigbour neigbours[NNEIGBOURS];
--- 561,570 ----
  
  /*
!  * Expiration timestamps are 4-bits wide, in units of 2 seconds, and
   * relative to cc2420_check_remote::toff.
   */
! #define SCALE_DIV_EXPIRE    2
! #define MAX_EXPIRE         15	/* 30 seconds */
! #define AGE_INTERVAL        5	/* 10 seconds */
  
  struct cc2420_neigbour neigbours[NNEIGBOURS];
***************
*** 645,649 ****
  
    /*
!    * Age neigbour table every 5*SCALE_DIV_EXPIRE=20 seconds.
     */
    static clock_time_t toff;
--- 645,649 ----
  
    /*
!    * Age neigbour table every 5*SCALE_DIV_EXPIRE=10 seconds.
     */
    static clock_time_t toff;