X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fsystem%2Ftos.h;h=ec49a208ff0ca21128e40fec961b742e75d031a7;hb=2e96092d00d12c635397cf4f1b1aa579b1ee77c4;hp=18d8bb4c18f921594679153670c65c40ac9ad8de;hpb=337d0b13acf569c2640b3ed7b7f5c7cec35d7ddd;p=tinyos-2.x.git

diff --git a/tos/system/tos.h b/tos/system/tos.h
index 18d8bb4c..ec49a208 100644
--- a/tos/system/tos.h
+++ b/tos/system/tos.h
@@ -16,6 +16,10 @@
 #include <stddef.h>
 #include <ctype.h>
 
+/* TEMPORARY: include the Safe TinyOS macros so that annotations get
+ * defined away for non-safe users */
+#include "../lib/safe/include/annots_stage1.h"
+
 typedef uint8_t bool;
 enum { FALSE = 0, TRUE = 1 };
 
@@ -26,9 +30,18 @@ uint16_t TOS_NODE_ID = 1;
    transfer in interfaces. See TEP 3 for more discussion. */
 #define PASS
 
+#ifdef NESC
 struct @atmostonce { };
 struct @atleastonce { };
 struct @exactlyonce { };
+#endif
+
+/* This platform_bootstrap macro exists in accordance with TEP
+   107. A platform may override this through a platform.h file. */
+#include <platform.h>
+#ifndef platform_bootstrap
+#define platform_bootstrap() {}
+#endif
 
 #ifndef TOSSIM
 #define dbg(s, ...) 
@@ -36,3 +49,4 @@ struct @exactlyonce { };
 #define dbg_clear(s, ...) 
 #define dbgerror_clear(s, ...) 
 #endif
+