Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tossim / tossim.c

diff --git a/tos/lib/tossim/tossim.c b/tos/lib/tossim/tossim.c
index 0e807d16a3c9a8420be93c08a45c778b9788e5f4..74283ccfe6c923ce03992b9e3f7a050eb03ff0a8 100644 (file)
--- a/tos/lib/tossim/tossim.c
+++ b/tos/lib/tossim/tossim.c
@@ -44,6 +44,7 @@
 #include <mac.c>
 #include <radio.c>
 #include <packet.c>
+#include <sim_noise.h>
 
 uint16_t TOS_NODE_ID = 1;
 
@@ -112,8 +113,8 @@ variable_string_t Variable::getData() {
     memcpy(data, ptr, len);
   }
   else {
-    str.ptr = "<no such variable>";
-    str.type = "<no such variable>";
+    str.ptr = (char*)"<no such variable>";
+    str.type = (char*)"<no such variable>";
     str.len = strlen("<no such variable>");
     str.isArray = 0;
   }
@@ -165,7 +166,7 @@ void Mote::setID(unsigned long val) {
 }
 
 Variable* Mote::getVariable(char* name) {
-  char* typeStr = "";
+  char* typeStr = (char*)"";
   int isArray;
   Variable* var;
   
@@ -190,6 +191,18 @@ Variable* Mote::getVariable(char* name) {
   return var;
 }
 
+void Mote::addNoiseTraceReading(int val) {
+  sim_noise_trace_add(id(), (char)val);
+}
+
+void Mote::createNoiseModel() {
+  sim_noise_create_model(id());
+}
+
+int Mote::generateNoise(int when) {
+  return (int)sim_noise_generate(id(), when);
+}
+
 Tossim::Tossim(nesc_app_t* n) {
   app = n;
   init();