Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/platforms/shimmer/.platform b/tos/platforms/shimmer/.platform
index 746a7a581a9fc0c3e10e8e77f207f08876938241..1a3a7e8db078ae31f566c41005353be606c87274 100644 (file)
--- a/tos/platforms/shimmer/.platform
+++ b/tos/platforms/shimmer/.platform
@@ -8,10 +8,13 @@
 
 push( @includes, qw(
 
+      .
   %T/platforms/shimmer
   %T/platforms/shimmer/chips/cc2420
   %T/platforms/shimmer/chips/mma7260
   %T/platforms/shimmer/chips/sd
+  %T/platforms/shimmer/chips/bluetooth
+  %T/platforms/shimmer/chips/msp430
   %T/chips/cc2420
   %T/chips/cc2420/alarm
   %T/chips/cc2420/control
@@ -25,6 +28,7 @@ push( @includes, qw(
   %T/chips/cc2420/spi
   %T/chips/cc2420/transmit
   %T/chips/cc2420/unique
+  %T/chips/cc2420/security
   %T/chips/msp430
   %T/chips/msp430/adc12
   %T/chips/msp430/dma
@@ -53,7 +57,7 @@ $ENV{'CIL_MACHINE'} =
     "version_major=3 " .
     "version_minor=2 " .
     "version=msp430-3.2.3 " .
-    "short=2,2, " .
+    "short=2,2 " .
     "int=2,2 " .
     "long=4,2 " .
     "long_long=8,2 " .
@@ -62,7 +66,7 @@ $ENV{'CIL_MACHINE'} =
     "float=4,2 " .
     "double=4,2 " .
     "long_double=4,2 " .
-    "void=2,1 " .
+    "void=1,1 " .
     "fun=1,2 " .
     "wchar_size_size=2,2 " .
     "alignof_string=1 " .
@@ -72,4 +76,4 @@ $ENV{'CIL_MACHINE'} =
     "big_endian=false " .
     "underscore_name=false " .
     "__builtin_va_list=true " .
-    "__thread_is_keyword=true";
\ No newline at end of file
+    "__thread_is_keyword=true";