[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel Makefile, 1.1, 1.2 telos_ap.c, 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-serv16969/apps/AccessPoint/kernel

Modified Files:
	Makefile telos_ap.c 
Log Message:

added shimmer platform, including programming mods to bsl.py
interface and lib updates to DMA->ADC machinery, test code
added SD lib module, test code
updates telos_ap.c/Makefile to handle old (pre-2.6.15) and new kernel ip api 
commented out interrupt flag clearing in setmodespi in hplusart[0-1]m.nc, because this breaks some spi comm initializations
added telosb platform to handle interface skew between new (shimmer) and old (telosb) platforms


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	29 Jul 2005 18:29:02 -0000	1.1
--- Makefile	3 Aug 2006 19:16:49 -0000	1.2
***************
*** 7,12 ****
  PWD     := $(shell pwd)
  
  default:
! 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
  
  clean cleanall:
--- 7,18 ----
  PWD     := $(shell pwd)
  
+ LINUX_VERSION := $(shell uname -r)
+ ifeq ($(shell /usr/bin/expr $(LINUX_VERSION) "<" 2.6.15),1)
+ $(warning Using older (<2.6.15) kernel definition $(LINUX_VERSION))
+ FLAGS = -DKERNEL_2_6_15_OR_LESS
+ endif
+ 
  default:
! 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) EXTRA_CFLAGS=$(FLAGS) modules
  
  clean cleanall:

Index: telos_ap.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/apps/AccessPoint/kernel/telos_ap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** telos_ap.c	29 Jul 2005 18:29:02 -0000	1.1
--- telos_ap.c	3 Aug 2006 19:16:49 -0000	1.2
***************
*** 1105,1109 ****
--- 1105,1111 ----
  	.poll            = telos_ap_poll,
  	.receive_buf	 = telos_ap_receive_buf,
+ #ifdef KERNEL_2_6_15_OR_LESS
  	.receive_room	 = telos_ap_receive_room,
+ #endif
  	.write_wakeup	 = telos_ap_write_wakeup,
  };