Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / csystem / CBlockStorageP.nc

diff --git a/tos/lib/tosthreads/csystem/CBlockStorageP.nc b/tos/lib/tosthreads/csystem/CBlockStorageP.nc
index 82817dcbcce1662101c5b86bc4071a7ea1bc6950..1c3a4bb6db9752e17790710b36f05bbb6d2efb87 100644 (file)
--- a/tos/lib/tosthreads/csystem/CBlockStorageP.nc
+++ b/tos/lib/tosthreads/csystem/CBlockStorageP.nc
@@ -31,27 +31,27 @@ module CBlockStorageP {
 }
 
 implementation {
-  error_t volumeBlockRead(uint8_t volumeId, storage_addr_t addr, void* buf, storage_len_t* len) @C() @spontaneous()
+  error_t volumeBlockRead(uint8_t volumeId, storage_addr_t addr, void* buf, storage_len_t* len) @C() AT_SPONTANEOUS
   {
     return call BlockingBlock.read[volumeId](addr, buf, len);
   }
   
-  error_t volumeBlockWrite(uint8_t volumeId, storage_addr_t addr, void* buf, storage_len_t* len)  @C() @spontaneous()
+  error_t volumeBlockWrite(uint8_t volumeId, storage_addr_t addr, void* buf, storage_len_t* len)  @C() AT_SPONTANEOUS
   {
     return call BlockingBlock.write[volumeId](addr, buf, len);
   }
   
-  error_t volumeBlockCrc(uint8_t volumeId, storage_addr_t addr, storage_len_t* len, uint16_t crc, uint16_t *finalCrc) @C() @spontaneous()
+  error_t volumeBlockCrc(uint8_t volumeId, storage_addr_t addr, storage_len_t* len, uint16_t crc, uint16_t *finalCrc) @C() AT_SPONTANEOUS
   {
     return call BlockingBlock.computeCrc[volumeId](addr, len, crc, finalCrc);
   }
   
-  error_t volumeBlockErase(uint8_t volumeId) @C() @spontaneous()
+  error_t volumeBlockErase(uint8_t volumeId) @C() AT_SPONTANEOUS
   {
     return call BlockingBlock.erase[volumeId]();
   }
   
-  error_t volumeBlockSync(uint8_t volumeId) @C() @spontaneous()
+  error_t volumeBlockSync(uint8_t volumeId) @C() AT_SPONTANEOUS
   {
     return call BlockingBlock.sync[volumeId]();
   }