Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / support / make / threads.extra

diff --git a/support/make/threads.extra b/support/make/threads.extra
index 16894b54e9f1cfcf5086ae2951a8b543d9d3e163..b39a734fa9889104abb236e10ecd43c12975cd7a 100644 (file)
--- a/support/make/threads.extra
+++ b/support/make/threads.extra
@@ -11,6 +11,7 @@ TOS_THREADS_DIR ?= $(TOSDIR)/lib/tosthreads
 CFLAGS += -I$(TOS_THREADS_DIR)/system
 CFLAGS += -I$(TOS_THREADS_DIR)/interfaces
 CFLAGS += -I$(TOS_THREADS_DIR)/types
+CFLAGS += -I$(TOS_THREADS_DIR)/lib/serial
 
 #Setup the thread scheduler for use by redefining the name of the task scheduler to use
 PFLAGS += -tosscheduler=TinyTaskSchedulerC,TinyTaskSchedulerC.TaskBasic,TaskBasic,TaskBasic,runTask,postTask
@@ -19,6 +20,7 @@ PFLAGS += -tosscheduler=TinyTaskSchedulerC,TinyTaskSchedulerC.TaskBasic,TaskBasi
 THREADS_MSP430_DIR = $(TOS_THREADS_DIR)/chips/msp430
 THREADS_MSP430_INCLUDE_DIRS = -I$(THREADS_MSP430_DIR)
 THREADS_MSP430_INCLUDE_DIRS += -I$(THREADS_MSP430_DIR)/adc12
+THREADS_MSP430_INCLUDE_DIRS += -I$(THREADS_MSP430_DIR)/sensors
 
 #Atm128 specific include directories on tested platforms
 THREADS_ATM128_DIR = $(TOS_THREADS_DIR)/chips/atm128
@@ -29,6 +31,10 @@ THREADS_ATM128_INCLUDE_DIRS += -I$(THREADS_ATM128_DIR)/adc
 THREADS_ATM1281_DIR = $(TOS_THREADS_DIR)/chips/atm1281
 THREADS_ATM1281_INCLUDE_DIRS = -I$(THREADS_ATM1281_DIR)
 
+#CC1000 specific include directories on tested platforms
+THREADS_CC1000_DIR = $(TOS_THREADS_DIR)/chips/cc1000
+THREADS_CC1000_INCLUDE_DIRS = -I$(THREADS_CC1000_DIR)
+
 #CC2420 specific include directories on tested platforms
 THREADS_CC2420_DIR = $(TOS_THREADS_DIR)/chips/cc2420
 THREADS_CC2420_INCLUDE_DIRS = -I$(THREADS_CC2420_DIR)
@@ -37,11 +43,24 @@ THREADS_CC2420_INCLUDE_DIRS = -I$(THREADS_CC2420_DIR)
 THREADS_RF230_DIR = $(TOS_THREADS_DIR)/chips/rf230
 THREADS_RF230_INCLUDE_DIRS = -I$(THREADS_RF230_DIR)
 
+#TDA5250 specific include directories on tested platforms
+THREADS_TDA5250_DIR = $(TOS_THREADS_DIR)/chips/tda5250
+THREADS_TDA5250_INCLUDE_DIRS = -I$(THREADS_TDA5250_DIR)
+
+#XE1205 specific include directories on tested platforms
+THREADS_XE1205_DIR = $(TOS_THREADS_DIR)/chips/xe1205
+THREADS_XE1205_INCLUDE_DIRS = -I$(THREADS_XE1205_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
+THREADS_MICA2_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/mica2
+THREADS_MICA2_INCLUDE_DIRS += -I$(TOS_THREADS_DIR)/platforms/mica2/chips/cc1000
+
+#Mica2dot specific include directories
+THREADS_MICA2DOT_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/mica2dot
+THREADS_MICA2DOT_INCLUDE_DIRS += -I$(TOS_THREADS_DIR)/platforms/mica2dot/chips/cc1000
 
 #MicaZ specific include directories
 THREADS_MICAZ_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/micaz
@@ -49,30 +68,69 @@ THREADS_MICAZ_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/micaz
 #IRIS specific include directories
 THREADS_IRIS_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/iris
 
+#TinyNode specific include directories
+THREADS_TINYNODE_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/tinynode
+
+#eyesIFX specific include directories
+THREADS_EYES_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/eyesIFX
+
+#Shimmer specific include directories
+THREADS_SHIMMER_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/shimmer
+
+#Epic specific include directories
+THREADS_EPIC_INCLUDE_DIRS = -I$(TOS_THREADS_DIR)/platforms/epic
+
 #Add CFLAGS for supported platforms
-ifneq ($(filter telos telosa telosb tmote eyesIFX eyesIFXv2 shimmer,$(MAKECMDGOALS)),)
-  CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
-endif
 ifneq ($(filter telos telosa telosb tmote,$(MAKECMDGOALS)),)
   CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
   CFLAGS += $(THREADS_TELOS_INCLUDE_DIRS)
+  
+  #Since Telosb has some sensors not on other platforms, this helps us figure out
+  #what components should be included
+  ifneq ($(filter telosb,$(MAKECMDGOALS)),)
+    CFLAGS += -DPLATFORM_TELOSB
+  endif
+endif
+ifneq ($(filter epic,$(MAKECMDGOALS)),)
+  CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_EPIC_INCLUDE_DIRS)
 endif
 ifneq ($(filter mica2,$(MAKECMDGOALS)),)
   CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC1000_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_MICA2_INCLUDE_DIRS)
+endif
+ifneq ($(filter mica2dot,$(MAKECMDGOALS)),)
+  CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC1000_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_MICA2DOT_INCLUDE_DIRS)
   CFLAGS += $(THREADS_MICA2_INCLUDE_DIRS)
 endif
 ifneq ($(filter micaz,$(MAKECMDGOALS)),)
   CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
   CFLAGS += $(THREADS_MICAZ_INCLUDE_DIRS)
 endif
 ifneq ($(filter iris,$(MAKECMDGOALS)),)
   CFLAGS += $(THREADS_ATM1281_INCLUDE_DIRS)
   CFLAGS += $(THREADS_ATM128_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_RF230_INCLUDE_DIRS)
   CFLAGS += $(THREADS_IRIS_INCLUDE_DIRS)
 endif
-ifneq ($(filter telos telosa telosb tmote micaz shimmer,$(MAKECMDGOALS)),)
-  CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
+ifneq ($(filter tinynode,$(MAKECMDGOALS)),) 
+  CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_XE1205_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_TINYNODE_INCLUDE_DIRS)
 endif
-ifneq ($(filter iris,$(MAKECMDGOALS)),)
-  CFLAGS += $(THREADS_RF230_INCLUDE_DIRS)
+ifneq ($(filter eyesIFX eyesIFXv2,$(MAKECMDGOALS)),)
+  CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_TDA5250_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_EYES_INCLUDE_DIRS)
+endif
+ifneq ($(filter shimmer,$(MAKECMDGOALS)),)
+  CFLAGS += $(THREADS_MSP430_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_CC2420_INCLUDE_DIRS)
+  CFLAGS += $(THREADS_SHIMMER_INCLUDE_DIRS)
 endif