From 4d3b4dbb139ec2f62f18e3bd5c19c734ff9939a2 Mon Sep 17 00:00:00 2001 From: klueska Date: Wed, 28 Oct 2009 04:19:20 +0000 Subject: [PATCH] Fixed up some stuff so we can compoile the tinyLD applications for tosthreads --- apps/BaseStation/Makefile | 1 + tools/tinyos/misc/tos-storage-at45db.in | 13 ++++++++----- tools/tinyos/misc/tos-storage-pxa27xp30.in | 14 ++++++++------ tools/tinyos/misc/tos-storage-stm25p.in | 6 ++++-- tos/lib/tosthreads/csystem/CConfigStorageC.nc | 2 +- tos/lib/tosthreads/lib/tinyld/TosThreadApiC.nc | 3 +++ .../tosthreads/lib/tinyld/tosthread_slcs_types.h | 1 + 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/apps/BaseStation/Makefile b/apps/BaseStation/Makefile index 98109ed5..be78a583 100644 --- 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 aa79f797..a58a9627 100644 --- 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 d5e205a6..44808e3f 100755 --- 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 1256b877..47cdb6d2 100644 --- 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 995065b2..c21c3dd7 100644 --- 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 225de13e..41128dae 100644 --- 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 dca4d4a8..1b14c0c2 100755 --- 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" -- 2.39.2