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

[steve ayer]

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

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

added macro to Makefile to detect kernels 2.6.19 forward, which have
dropped linux/config.h; they now use linux/autoconf.h

source files fixed to reflect this change


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	3 Aug 2006 19:16:49 -0000	1.2
--- Makefile	23 Feb 2007 17:14:34 -0000	1.3
***************
*** 13,16 ****
--- 13,21 ----
  endif
  
+ ifeq ($(shell /usr/bin/expr $(LINUX_VERSION) ">" 2.6.18),1)
+ $(warning Using newer (> 2.6.18) kernel definition $(LINUX_VERSION))
+ FLAGS = -DKERNEL_2_6_19_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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** telos_ap.c	15 Nov 2006 19:22:40 -0000	1.3
--- telos_ap.c	23 Feb 2007 17:14:34 -0000	1.4
***************
*** 37,41 ****
--- 37,45 ----
  
  #define SL_CHECK_TRANSMIT
+ #ifdef KERNEL_2_6_19_OR_NEWER
+ #include <linux/autoconf.h>
+ #else
  #include <linux/config.h>
+ #endif
  #include <linux/module.h>
  

Index: telos_ap.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** telos_ap.h	29 Jul 2005 18:29:02 -0000	1.1
--- telos_ap.h	23 Feb 2007 17:14:34 -0000	1.2
***************
*** 41,46 ****
  #define _LINUX_TELOS_AP_H
  
  #include <linux/config.h>
! 
  /* TELOS_AP configuration. */
  #define TELOS_NRUNIT	8		/* MAX number of TELOS_AP channels;
--- 41,49 ----
  #define _LINUX_TELOS_AP_H
  
+ #ifdef KERNEL_2_6_19_OR_NEWER
+ #include <linux/autoconf.h>
+ #else
  #include <linux/config.h>
! #endif
  /* TELOS_AP configuration. */
  #define TELOS_NRUNIT	8		/* MAX number of TELOS_AP channels;