Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / iris / .platform

diff --git a/tos/platforms/iris/.platform b/tos/platforms/iris/.platform
index fb79ce375fead0f86748a5978ffca9d654411afe..1f97d154fd5b4a99a9a189e2a8973045ea61974a 100644 (file)
--- a/tos/platforms/iris/.platform
+++ b/tos/platforms/iris/.platform
@@ -1,10 +1,10 @@
 #
 # FILE: micaz/.platform
-# 
+#
 # Includes that should take precedence come first.  Platforms come before
 # chips because they may override files.  These must be specified as
 # @includes instead of -I's to @opts, otherwise the %T won't be processed
-# by ncc.  
+# by ncc.
 #
 # $Id$
 #
@@ -13,14 +13,19 @@ push( @includes, qw(
   %T/platforms/micaz
   %T/platforms/mica
   %T/platforms/iris/chips/rf230
-  %T/chips/rf230
-  %T/chips/cc2420      # for IEEE802154.h
+  %T/chips/rf2xx/rf230
+  %T/chips/rf2xx/layers
+  %T/chips/rf2xx/util
+  %T/platforms/iris/chips/at45db
   %T/platforms/mica2/chips/at45db
   %T/platforms/mica/chips/at45db
   %T/chips/at45db
-  %T/chips/atm1281  
+  %T/platforms/iris/chips/ds2401
+  %T/platforms/mica2/chips/ds2401
+  %T/chips/ds2401
+  %T/chips/atm1281
   %T/chips/atm1281/adc
-  %T/chips/atm1281/timer  
+  %T/chips/atm1281/timer
   %T/chips/atm128
   %T/chips/atm128/adc
   %T/chips/atm128/pins
@@ -30,7 +35,7 @@ push( @includes, qw(
   %T/lib/timer
   %T/lib/serial
   %T/lib/power
-  %T/lib/diagmsg       # for testing purposes
+  %T/lib/diagmsg
 
 ) );
 
@@ -46,3 +51,28 @@ push( @includes, qw(
 push @opts, "-fnesc-scheduler=TinySchedulerC,TinySchedulerC.TaskBasic,TaskBasic,TaskBasic,runTask,postTask" if !$with_scheduler_flag;
 push @opts, "-mingw-gcc" if $cygwin;
 
+$ENV{'CIL_MACHINE'} =
+    "version_major=3 " .
+    "version_minor=4 " .
+    "version=avr-3.4.3 " .
+    "short=2,1, " .
+    "int=2,1 " .
+    "long=4,1 " .
+    "long_long=8,1 " .
+    "pointer=2,1 " .
+    "enum=2,1 " .
+    "float=4,1 " .
+    "double=4,1 " .
+    "long_double=4,1 " .
+    "void=1,1 " .
+    "fun=1,1 " .
+    "wchar_size_size=2,2 " .
+    "alignof_string=1 " .
+    "max_alignment=1 " .
+    "char_wchar_signed=true,true " .
+    "const_string_literals=true " .
+    "big_endian=false " .
+    "underscore_name=false " .
+    "__builtin_va_list=true " .
+    "__thread_is_keyword=true";
+    
\ No newline at end of file