get rid of +5 for rounding, change arg name in functions in CtpInfo to match the...

[tinyos-2.x.git] / tos / system / tos.h

diff --git a/tos/system/tos.h b/tos/system/tos.h
index 38292e8f013ed4d11d084927067c8577348f69e7..ec49a208ff0ca21128e40fec961b742e75d031a7 100644 (file)
--- a/tos/system/tos.h
+++ b/tos/system/tos.h
@@ -16,19 +16,32 @@
 #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 };
 
-typedef int8_t nx_bool __attribute__((nx_base(int8)));
+typedef nx_int8_t nx_bool;
 uint16_t TOS_NODE_ID = 1;
 
 /* This macro is used to mark pointers that represent ownership
    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
+