[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel telos_ap.c, 1.2, 1.3

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8144

Modified Files:
	telos_ap.c 
Log Message:

updates that handle both old and new kernel apis


Index: telos_ap.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** telos_ap.c	3 Aug 2006 19:16:49 -0000	1.2
--- telos_ap.c	15 Nov 2006 19:22:40 -0000	1.3
***************
*** 70,74 ****
  
  int telos_ap_maxdev = TELOS_NRUNIT;		/* Can be overridden with insmod! */
! MODULE_PARM(telos_ap_maxdev, "i");
  MODULE_PARM_DESC(telos_ap_maxdev, "Maximum number of telos_ap devices");
  
--- 70,75 ----
  
  int telos_ap_maxdev = TELOS_NRUNIT;		/* Can be overridden with insmod! */
! module_param(telos_ap_maxdev, int, S_IRUSR);
! //MODULE_PARM(telos_ap_maxdev, "i");
  MODULE_PARM_DESC(telos_ap_maxdev, "Maximum number of telos_ap devices");
  
***************
*** 626,629 ****
--- 627,631 ----
   ******************************************/
  
+ #ifdef KERNEL_2_6_15_OR_LESS
  
  static int 
***************
*** 633,636 ****
--- 635,640 ----
  }
  
+ #endif
+ 
  /*
   * Handle the 'receiver data ready' interrupt.