[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel Makefile, 1.3, 1.4 telos_ap.c, 1.5, 1.6 telos_ap.h, 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-serv8870

Modified Files:
	Makefile telos_ap.c telos_ap.h 
Log Message:

mods to handle the disappearance of SET_MODULE_NAME in kernels >
2.6.24.

makefile detects; telos_ap.h defines this macro for backward
compatibility; ifdef header includes are also adjusted accordingly.



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	23 Feb 2007 17:14:34 -0000	1.3
--- Makefile	30 Jan 2008 20:01:17 -0000	1.4
***************
*** 18,21 ****
--- 18,27 ----
  endif
  
+ ifeq ($(shell /usr/bin/expr $(LINUX_VERSION) ">=" 2.6.24),1)
+ $(warning Using newer (<= 2.6.24) kernel definition $(LINUX_VERSION))
+ FLAGS = -DKERNEL_2_6_24_OR_NEWER
+ endif
+ 
+ 
  default:
  	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) EXTRA_CFLAGS=$(FLAGS) modules

Index: telos_ap.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** telos_ap.c	11 Jul 2007 15:49:05 -0000	1.5
--- telos_ap.c	30 Jan 2008 20:01:18 -0000	1.6
***************
*** 37,41 ****
  
  #define SL_CHECK_TRANSMIT
! #ifdef KERNEL_2_6_19_OR_NEWER
  #include <linux/autoconf.h>
  #else
--- 37,43 ----
  
  #define SL_CHECK_TRANSMIT
! #ifdef KERNEL_2_6_24_OR_NEWER
! #include <linux/autoconf.h>
! #elif defined KERNEL_2_6_19_OR_NEWER
  #include <linux/autoconf.h>
  #else

Index: telos_ap.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** telos_ap.h	23 Feb 2007 17:14:34 -0000	1.2
--- telos_ap.h	30 Jan 2008 20:01:18 -0000	1.3
***************
*** 41,45 ****
  #define _LINUX_TELOS_AP_H
  
! #ifdef KERNEL_2_6_19_OR_NEWER
  #include <linux/autoconf.h>
  #else
--- 41,48 ----
  #define _LINUX_TELOS_AP_H
  
! #ifdef KERNEL_2_6_24_OR_NEWER
! #define SET_MODULE_OWNER(dev) do { } while (0)
! #include <linux/autoconf.h>
! #elif defined KERNEL_2_6_19_OR_NEWER
  #include <linux/autoconf.h>
  #else