[Tinyos-2-commits] CVS: tinyos-2.x/support/make threads.extra, 1.3, 1.4

[Chieh-Jan Mike Liang]

Update of /cvsroot/tinyos/tinyos-2.x/support/make
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31983/support/make

Modified Files:
	threads.extra 
Log Message:
Fix the CC2420 Receive.receive and Snoop.receive fan-out warnings. This happened when both TinyOS services and TOSThreads 
apps want to use the radio. Now, TinyOS services have priority over TOSThreads apps on which AM ID they want to use.


Index: threads.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/threads.extra,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** threads.extra	2 Jul 2008 17:22:05 -0000	1.3
--- threads.extra	12 Jul 2008 02:25:59 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  # Extra threads Makefile target to enable thread support for tinyos
  # Kevin Klues May 16th, 2008
+ # Chieh-Jan Mike Liang July 11th, 2008
  
  #Set up flag signifying threads are enabled 
***************
*** 29,37 ****
  THREADS_ATM1281_INCLUDE_DIRS = -I$(THREADS_ATM1281_DIR)
  
  #Telos specific include directories
  THREADS_TELOS_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/telosa
  
  #Mica2 specific include directories
! THREADS_MICA2_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/mica2/chips/cc1000
  
  #Add CFLAGS for supported platforms
--- 30,45 ----
  THREADS_ATM1281_INCLUDE_DIRS = -I$(THREADS_ATM1281_DIR)
  
+ #CC2420 specific include directories on tested platforms
+ THREADS_CC2420_DIR = $(TOS_THREADS_DIR)/chips/cc2420
+ THREADS_CC2420_INCLUDE_DIRS = -I$(THREADS_CC2420_DIR)
+ 
  #Telos specific include directories
  THREADS_TELOS_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/telosa
  
  #Mica2 specific include directories
! THREADS_MICA2_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/chips/cc1000 -I$(TOS_THREADS_DIR)/platforms/mica2/chips/cc1000 -I$(TOS_THREADS_DIR)/platforms/mica2
! 
! #MicaZ specific include directories
! THREADS_MICAZ_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/micaz
  
  #Add CFLAGS for supported platforms
***************
*** 49,52 ****
--- 57,61 ----
  ifneq ($(filter micaz,$(MAKECMDGOALS)),) 
    CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
+   CFLAGS += $(THREADS_MICAZ_INCLUDE_DIRS)
  endif
  ifneq ($(filter iris,$(MAKECMDGOALS)),) 
***************
*** 54,55 ****
--- 63,67 ----
    CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
  endif
+ ifneq ($(filter telos telosa telosb tmote micaz shimmer,$(MAKECMDGOALS)),) 
+   CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
+ endif