Fixed up some stuff so we can compoile the tinyLD applications for tosthreads

diff --git a/apps/BaseStation/Makefile b/apps/BaseStation/Makefile
index 98109ed5ba4f99181777e1cc9d19ec41ef72ae2a..be78a583bf94dc9d3d5b9638c663da556b7274f6 100644 (file)
--- a/apps/BaseStation/Makefile
+++ b/apps/BaseStation/Makefile
@@ -1,4 +1,5 @@
 COMPONENT=BaseStationC
+PFLAGS += -DCC2420_DEF_CHANNEL=21
 CFLAGS += -DCC2420_NO_ACKNOWLEDGEMENTS
 CFLAGS += -DCC2420_NO_ADDRESS_RECOGNITION
 CFLAGS += -DTASKLET_IS_TASK

diff --git a/tools/tinyos/misc/tos-storage-at45db.in b/tools/tinyos/misc/tos-storage-at45db.in
index aa79f797bf6ed35d72e772107fd2b6c80269d1fb..a58a962767198dc989ef630b88ececd2099fc7cb 100644 (file)
--- a/tools/tinyos/misc/tos-storage-at45db.in
+++ b/tools/tinyos/misc/tos-storage-at45db.in
@@ -229,7 +229,7 @@ if cthreads == True:
   outFile.write("    interface BlockWrite[uint8_t volume_id]; \n")
   outFile.write("    interface LogRead[uint8_t volumeId]; \n")
   outFile.write("    interface LogWrite[uint8_t volumeId]; \n")
-  outFile.write("    interface Mount as ConfigMount[uint8_t volumeId]; \n")
+  outFile.write("    interface Mount[uint8_t volumeId]; \n")
   outFile.write("    interface ConfigStorage[uint8_t volumeId]; \n")
   outFile.write("  } \n")
   outFile.write("} \n")
@@ -241,6 +241,9 @@ if cthreads == True:
   outFile.write("  BlockWrite = VolumeMapP; \n")
   outFile.write("  LogRead = VolumeMapP; \n")
   outFile.write("  LogWrite = VolumeMapP; \n")
+  outFile.write("  Mount = VolumeMapP; \n")
+  outFile.write("  ConfigStorage = VolumeMapP; \n")
+
 
   for i in range(len(volumeNames)):
     if volumeTypes[volumeNames[i]] == "block":
@@ -257,9 +260,9 @@ if cthreads == True:
       outFile.write("  VolumeMapP.SubLogWrite[" + volumeNames[i] + "] -> LogStorageC_" + volumeNames[i] + "; \n")
       outFile.write("\n")
 
-    elif volumeTypes[volumeNames[i]] == "config":
-      outFile.write("  components new ConfigStorageC(" + volumeNames[i] + ") as ConfigStorageC_" + volumeNames[i] + "; \n")
-      outFile.write("  ConfigMount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
-      outFile.write("  ConfigStorage[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
+     elif volumeTypes[volumeNames[i]] == "config":
+       outFile.write("  components new ConfigStorageC(" + volumeNames[i] + ") as ConfigStorageC_" + volumeNames[i] + "; \n")
+       outFile.write("  Mount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
+       outFile.write("  ConfigStorage[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
   outFile.write("} \n")
 

diff --git a/tools/tinyos/misc/tos-storage-pxa27xp30.in b/tools/tinyos/misc/tos-storage-pxa27xp30.in
index d5e205a670a9a439e29d44046e8d6de275c8149b..44808e3f02582506a9ac7a57e3cd062afe3759ec 100755 (executable)
--- a/tools/tinyos/misc/tos-storage-pxa27xp30.in
+++ b/tools/tinyos/misc/tos-storage-pxa27xp30.in
@@ -200,8 +200,8 @@ if cthreads == True:
   outFile.write("    interface BlockWrite[uint8_t volume_id]; \n")
   outFile.write("    interface LogRead[uint8_t volumeId]; \n")
   outFile.write("    interface LogWrite[uint8_t volumeId]; \n")
-  outFile.write("    interface Mount as ConfigMount[uint8_t volumeId]; \n")
-  outFile.write("    interface ConfigStorage[uint8_t volumeId]; \n")
+   outFile.write("    interface Mount[uint8_t volumeId]; \n")
+   outFile.write("    interface ConfigStorage[uint8_t volumeId]; \n")
   outFile.write("  } \n")
   outFile.write("} \n")
   outFile.write("\n")
@@ -212,6 +212,8 @@ if cthreads == True:
   outFile.write("  BlockWrite = VolumeMapP; \n")
   outFile.write("  LogRead = VolumeMapP; \n")
   outFile.write("  LogWrite = VolumeMapP; \n")
+  outFile.write("  Mount = VolumeMapP; \n")
+  outFile.write("  ConfigStorage = VolumeMapP; \n")
 
   for i in range(len(volumeNames)):
     if volumeTypes[volumeNames[i]] == "block":
@@ -228,8 +230,8 @@ if cthreads == True:
       outFile.write("  VolumeMapP.SubLogWrite[" + volumeNames[i] + "] -> LogStorageC_" + volumeNames[i] + "; \n")
       outFile.write("\n")
 
-    elif volumeTypes[volumeNames[i]] == "config":
-      outFile.write("  components new ConfigStorageC(" + volumeNames[i] + ") as ConfigStorageC_" + volumeNames[i] + "; \n")
-      outFile.write("  ConfigMount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
-      outFile.write("  ConfigStorage[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
+     elif volumeTypes[volumeNames[i]] == "config":
+       outFile.write("  components new ConfigStorageC(" + volumeNames[i] + ") as ConfigStorageC_" + volumeNames[i] + "; \n")
+       outFile.write("  Mount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
+       outFile.write("  ConfigStorage[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
   outFile.write("} \n")

diff --git a/tools/tinyos/misc/tos-storage-stm25p.in b/tools/tinyos/misc/tos-storage-stm25p.in
index 1256b8776b04d8b0c94f7e24793658121a6c0e58..47cdb6d2634d6854c1fede960614a845d3f3775a 100644 (file)
--- a/tools/tinyos/misc/tos-storage-stm25p.in
+++ b/tools/tinyos/misc/tos-storage-stm25p.in
@@ -247,7 +247,7 @@ if cthreads == True:
   outFile.write("    interface BlockWrite[uint8_t volume_id]; \n")
   outFile.write("    interface LogRead[uint8_t volumeId]; \n")
   outFile.write("    interface LogWrite[uint8_t volumeId]; \n")
-  outFile.write("    interface Mount as ConfigMount[uint8_t volumeId]; \n")
+  outFile.write("    interface Mount[uint8_t volumeId]; \n")
   outFile.write("    interface ConfigStorage[uint8_t volumeId]; \n")
   outFile.write("  } \n")
   outFile.write("} \n")
@@ -259,6 +259,8 @@ if cthreads == True:
   outFile.write("  BlockWrite = VolumeMapP; \n")
   outFile.write("  LogRead = VolumeMapP; \n")
   outFile.write("  LogWrite = VolumeMapP; \n")
+  outFile.write("  Mount = VolumeMapP; \n")
+  outFile.write("  ConfigStorage = VolumeMapP; \n")
 
   for i in range(len(volumeNames)):
     if volumeTypes[volumeNames[i]] == "block":
@@ -277,6 +279,6 @@ if cthreads == True:
 
     elif volumeTypes[volumeNames[i]] == "config":
       outFile.write("  components new ConfigStorageC(" + volumeNames[i] + ") as ConfigStorageC_" + volumeNames[i] + "; \n")
-      outFile.write("  ConfigMount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
+      outFile.write("  Mount[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
       outFile.write("  ConfigStorage[" + volumeNames[i] + "] = ConfigStorageC_" + volumeNames[i] + "; \n")
   outFile.write("} \n")

diff --git a/tos/lib/tosthreads/csystem/CConfigStorageC.nc b/tos/lib/tosthreads/csystem/CConfigStorageC.nc
index 995065b206ddba3c079c797cd91ab6f8ffa31e41..c21c3dd7d927d4cedaad13c9056efe655f5e24c9 100644 (file)
--- a/tos/lib/tosthreads/csystem/CConfigStorageC.nc
+++ b/tos/lib/tosthreads/csystem/CConfigStorageC.nc
@@ -34,6 +34,6 @@ implementation {
   CConfigStorageP.BlockingConfig -> BlockingConfigStorageP;
   CConfigStorageP.BlockingMount -> BlockingConfigStorageP;
 
-  BlockingConfigStorageP.ConfigMount -> VolumeMapC.ConfigMount;
+  BlockingConfigStorageP.ConfigMount -> VolumeMapC.Mount;
   BlockingConfigStorageP.ConfigStorage -> VolumeMapC.ConfigStorage;
 }

diff --git a/tos/lib/tosthreads/lib/tinyld/TosThreadApiC.nc b/tos/lib/tosthreads/lib/tinyld/TosThreadApiC.nc
index 225de13eff21cd429067dcd6003567c4dff31503..41128dae0443d31392e005810e18ea953b664261 100644 (file)
--- a/tos/lib/tosthreads/lib/tinyld/TosThreadApiC.nc
+++ b/tos/lib/tosthreads/lib/tinyld/TosThreadApiC.nc
@@ -64,6 +64,9 @@ implementation {
   #if defined(TOSTHREAD_BLOCKSTORAGE_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
     components CBlockStorageC;
   #endif 
+  #if defined(TOSTHREAD_BLOCKSTORAGE_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
+    components CConfigStorageC;
+  #endif 
   #if defined(TOSTHREAD_LOGSTORAGE_H) || defined(TOSTHREAD_DYNAMIC_LOADER)
     components CLogStorageC;
   #endif 

diff --git a/tos/lib/tosthreads/lib/tinyld/tosthread_slcs_types.h b/tos/lib/tosthreads/lib/tinyld/tosthread_slcs_types.h
index dca4d4a82ea7fc02c43e65a6948e6eda04470650..1b14c0c27525b472c311b3b61a7b3272f45d64fa 100755 (executable)
--- a/tos/lib/tosthreads/lib/tinyld/tosthread_slcs_types.h
+++ b/tos/lib/tosthreads/lib/tinyld/tosthread_slcs_types.h
@@ -32,6 +32,7 @@
 #include "tosthread_amradio.h"
 #include "tosthread_blockstorage.h"
 #include "tosthread_logstorage.h"
+#include "tosthread_configstorage.h"
 #include "tosthread_threadsync.h"
 #include "tosthread_amserial.h"
 #include "tosthread_queue.h"