turn on safe compilation for some modules

diff --git a/apps/BaseStation/BaseStationP.nc b/apps/BaseStation/BaseStationP.nc
index 04e64c44fd006225b07a4b64ca66610dc9549af7..2e647c7f83c6429b89f9c2ab7de285cc82cd507f 100644 (file)
--- a/apps/BaseStation/BaseStationP.nc
+++ b/apps/BaseStation/BaseStationP.nc
@@ -46,7 +46,7 @@
 #include "AM.h"
 #include "Serial.h"
 
-module BaseStationP {
+module BaseStationP @safe() {
   uses {
     interface Boot;
     interface SplitControl as SerialControl;

diff --git a/apps/tests/msp430/Adc12/TestAdcMultiC.nc b/apps/tests/msp430/Adc12/TestAdcMultiC.nc
index 5393334234971288dbbbcdf2e1bf3fa8d595cdd1..2115b8bfada279d6ca1908da1710b57b9eaed50b 100644 (file)
--- a/apps/tests/msp430/Adc12/TestAdcMultiC.nc
+++ b/apps/tests/msp430/Adc12/TestAdcMultiC.nc
@@ -50,7 +50,7 @@ generic module TestAdcMultiC(
 
                           uint8_t inch2,           // second input channel 
                           uint8_t sref2            // second reference voltage 
-)
+) @safe()
 {
   uses {
     interface Boot;

diff --git a/apps/tests/msp430/Adc12/TestAdcSingleC.nc b/apps/tests/msp430/Adc12/TestAdcSingleC.nc
index 809e4cac444b7025497c94296190f25509cfcffa..e44d9ae4cc2ea7fdd56ff43df7562d9e4e05a1a2 100644 (file)
--- a/apps/tests/msp430/Adc12/TestAdcSingleC.nc
+++ b/apps/tests/msp430/Adc12/TestAdcSingleC.nc
@@ -47,7 +47,7 @@ generic module TestAdcSingleC(
                           uint8_t sht,             // sample-hold-time
                           uint8_t sampcon_ssel,    // clock source sampcon signal 
                           uint8_t sampcon_id       // clock divider sampcon 
-)
+) @safe()
 {
   uses {
     interface Boot;

diff --git a/apps/tests/storage/Config/RandRWC.nc b/apps/tests/storage/Config/RandRWC.nc
index 829c99ced7fb9a2421553afc12cf837a6203a3ca..6076213422c74ae9b074d05f4d2ad218ea808a69 100644 (file)
--- a/apps/tests/storage/Config/RandRWC.nc
+++ b/apps/tests/storage/Config/RandRWC.nc
@@ -13,7 +13,7 @@
  *
  * @author David Gay
  */
-module RandRWC {
+module RandRWC @safe() {
   uses {
     interface Boot;
     interface Leds;

diff --git a/apps/tutorials/RssiDemo/InterceptBase/BaseStationP.nc b/apps/tutorials/RssiDemo/InterceptBase/BaseStationP.nc
index 940d9ec8ece59f13bdeb6d6d5b4c713d957de769..9b3d79e176b77f48ff1edcbbef1e9b8e830585e3 100644 (file)
--- a/apps/tutorials/RssiDemo/InterceptBase/BaseStationP.nc
+++ b/apps/tutorials/RssiDemo/InterceptBase/BaseStationP.nc
@@ -44,7 +44,7 @@
 #include "AM.h"
 #include "Serial.h"
 
-module BaseStationP {
+module BaseStationP @safe() {
   uses {
     interface Boot;
     interface SplitControl as SerialControl;

diff --git a/tos/chips/at45db/At45dbP.nc b/tos/chips/at45db/At45dbP.nc
index 43fb955969d5f9c3ff60056d8076f92db53ecceb..1de75c80c01e68a94697060c06ebed2b3a72f3db 100644 (file)
--- a/tos/chips/at45db/At45dbP.nc
+++ b/tos/chips/at45db/At45dbP.nc
@@ -39,7 +39,7 @@
  * @author David Gay
  */
 
-module At45dbP {
+module At45dbP @safe() {
   provides {
     interface Init;
     interface At45db;

diff --git a/tos/chips/at45db/BlockStorageP.nc b/tos/chips/at45db/BlockStorageP.nc
index 3fa6a9c546ca9bdb3d31cb35e75c6d497647e82d..8266d4c2c89f05deadd3c1149ccbf70d820bd846 100644 (file)
--- a/tos/chips/at45db/BlockStorageP.nc
+++ b/tos/chips/at45db/BlockStorageP.nc
@@ -39,7 +39,7 @@
 
 #include "Storage.h"
 
-module BlockStorageP {
+module BlockStorageP @safe() {
   provides {
     interface BlockWrite[uint8_t blockId];
     interface BlockRead[uint8_t blockId];

diff --git a/tos/chips/at45db/ConfigStorageP.nc b/tos/chips/at45db/ConfigStorageP.nc
index 37370f7fdc3acfd7fa5714be4e916d9f7e57fd5d..67bd6a8fb2f830065b18b0cf77a4112c52d2adb4 100644 (file)
--- a/tos/chips/at45db/ConfigStorageP.nc
+++ b/tos/chips/at45db/ConfigStorageP.nc
@@ -20,7 +20,7 @@
 #include "Storage.h"
 #include "crc.h"
 
-module ConfigStorageP {
+module ConfigStorageP @safe() {
   provides {
     interface Mount[uint8_t id];
     interface ConfigStorage[uint8_t id];

diff --git a/tos/chips/at45db/HplAt45dbByteC.nc b/tos/chips/at45db/HplAt45dbByteC.nc
index 925f3128d5b318c6295edb508c429a4b0e2e5caa..46f0a52081345c04e5fb38653cce9e331dc58588 100644 (file)
--- a/tos/chips/at45db/HplAt45dbByteC.nc
+++ b/tos/chips/at45db/HplAt45dbByteC.nc
@@ -22,7 +22,7 @@
  * @author David Gay
  */
 
-generic module HplAt45dbByteC(int sectorSizeLog2) {
+generic module HplAt45dbByteC(int sectorSizeLog2) @safe() {
   provides interface HplAt45db;
   uses {
     interface Resource;

diff --git a/tos/chips/at45db/LogStorageP.nc b/tos/chips/at45db/LogStorageP.nc
index 8765682960dd1f2b422d157491284ea5fea31aaf..bf8660ebca4cf4378ce0cf8b64c490b1610d1138 100644 (file)
--- a/tos/chips/at45db/LogStorageP.nc
+++ b/tos/chips/at45db/LogStorageP.nc
@@ -38,7 +38,7 @@
  * @author: Jonathan Hui <jwhui@cs.berkeley.edu>
  */
 
-module LogStorageP {
+module LogStorageP @safe() {
   provides {
     interface LogRead[uint8_t logId];
     interface LogWrite[uint8_t logId];

diff --git a/tos/chips/atm128/Atm128UartP.nc b/tos/chips/atm128/Atm128UartP.nc
index 527e264e48e01eb465d14bec459e4ed801da0aaa..70b48e5ac7a4efda39e8fcbc67aa7c46d6170ff8 100644 (file)
--- a/tos/chips/atm128/Atm128UartP.nc
+++ b/tos/chips/atm128/Atm128UartP.nc
@@ -43,7 +43,7 @@
 
 #include <Timer.h>
 
-generic module Atm128UartP(){
+generic module Atm128UartP() @safe() {
   
   provides interface Init;
   provides interface StdControl;

diff --git a/tos/chips/atm128/adc/AdcStreamP.nc b/tos/chips/atm128/adc/AdcStreamP.nc
index dae467e350c114273e43014a94310de3ea9c6964..b5a844f44bead883422af7de1c431c16e116ed04 100644 (file)
--- a/tos/chips/atm128/adc/AdcStreamP.nc
+++ b/tos/chips/atm128/adc/AdcStreamP.nc
@@ -43,7 +43,7 @@
  */
 #include "Timer.h"
 
-module AdcStreamP {
+module AdcStreamP @safe() {
   provides {
     interface Init @atleastonce();
     interface ReadStream<uint16_t>[uint8_t client];

diff --git a/tos/chips/atm128/pins/HplAtm128GeneralIOPinP.nc b/tos/chips/atm128/pins/HplAtm128GeneralIOPinP.nc
index 786f77a021bca2552a5f4aefb05712ee591e1adc..f21f061fb65a966425b2fd11f16cd2c576f2666a 100644 (file)
--- a/tos/chips/atm128/pins/HplAtm128GeneralIOPinP.nc
+++ b/tos/chips/atm128/pins/HplAtm128GeneralIOPinP.nc
@@ -32,7 +32,7 @@
 generic module HplAtm128GeneralIOPinP (uint8_t port_addr, 
                                 uint8_t ddr_addr, 
                                 uint8_t pin_addr,
-                                uint8_t bit)
+                                uint8_t bit) @safe()
 {
   provides interface GeneralIO as IO;
 }

diff --git a/tos/chips/atm128/pins/HplAtm128GeneralIOSlowPinP.nc b/tos/chips/atm128/pins/HplAtm128GeneralIOSlowPinP.nc
index 48f33d3e295b48b6c0a453e4dcd5e551b11ee8d2..a6168ff144942bbcc5c6ee0e3bd19f4675ed5854 100644 (file)
--- a/tos/chips/atm128/pins/HplAtm128GeneralIOSlowPinP.nc
+++ b/tos/chips/atm128/pins/HplAtm128GeneralIOSlowPinP.nc
@@ -33,7 +33,7 @@
 generic module HplAtm128GeneralIOSlowPinP (uint8_t port_addr, 
                                     uint8_t ddr_addr, 
                                     uint8_t pin_addr,
-                                    uint8_t bit)
+                                    uint8_t bit) @safe()
 {
   provides interface GeneralIO as IO;
 }

diff --git a/tos/chips/atm128/pins/HplAtm128InterruptPinP.nc b/tos/chips/atm128/pins/HplAtm128InterruptPinP.nc
index 36b0f030403fe0c87db215a199d5823476c2093d..3f94f56f13004a40025a2ac561c26e16b165435f 100644 (file)
--- a/tos/chips/atm128/pins/HplAtm128InterruptPinP.nc
+++ b/tos/chips/atm128/pins/HplAtm128InterruptPinP.nc
@@ -30,7 +30,7 @@
 generic module HplAtm128InterruptPinP (uint8_t ctrl_addr, 
                                 uint8_t edge0bit, 
                                 uint8_t edge1bit, 
-                                uint8_t bit)
+                                uint8_t bit) @safe()
 {
   provides interface HplAtm128Interrupt as Irq;
   uses interface HplAtm128InterruptSig as IrqSignal;

diff --git a/tos/chips/atm128/spi/Atm128SpiP.nc b/tos/chips/atm128/spi/Atm128SpiP.nc
index ffa653cc904b40eeb721c232163e1e9afdafd9e3..6bec916b6c249e94f4677f514eab6d0d76af8f02 100644 (file)
--- a/tos/chips/atm128/spi/Atm128SpiP.nc
+++ b/tos/chips/atm128/spi/Atm128SpiP.nc
@@ -72,7 +72,7 @@
  *
  */
 
-module Atm128SpiP {
+module Atm128SpiP @safe() {
   provides {
     interface Init;
     interface SpiByte;

diff --git a/tos/chips/atm128/timer/HplAtm128Timer1P.nc b/tos/chips/atm128/timer/HplAtm128Timer1P.nc
index 91f6ebf6f03224038ccca4ec56261d4b8d51625f..6dfcff00ece460335802818820fb75575a5eef5a 100644 (file)
--- a/tos/chips/atm128/timer/HplAtm128Timer1P.nc
+++ b/tos/chips/atm128/timer/HplAtm128Timer1P.nc
@@ -30,7 +30,7 @@
 
 #include <Atm128Timer.h>
 
-module HplAtm128Timer1P
+module HplAtm128Timer1P @safe()
 {
   provides {
     // 16-bit Timers

diff --git a/tos/chips/cc1000/CC1000ActiveMessageP.nc b/tos/chips/cc1000/CC1000ActiveMessageP.nc
index 08adb2039e3b65e310a10b47751cd4ff1bb67470..40ecaae9e17ca6c78efb61f64991ab7f0a5ad4e3 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageP.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageP.nc
@@ -35,7 +35,7 @@
  * @date June 19 2006
  */
 
-module CC1000ActiveMessageP {
+module CC1000ActiveMessageP @safe() {
   provides {
     interface AMSend[am_id_t id];
     interface Receive[am_id_t id];

diff --git a/tos/chips/cc1000/CC1000CsmaP.nc b/tos/chips/cc1000/CC1000CsmaP.nc
index 505f2cfa6458a20b441ffbaa79d69476c051e16f..a462556c7140b85a640de3ba09501b89184885bf 100644 (file)
--- a/tos/chips/cc1000/CC1000CsmaP.nc
+++ b/tos/chips/cc1000/CC1000CsmaP.nc
@@ -50,7 +50,7 @@
  * @author David Gay
  */
   
-module CC1000CsmaP {
+module CC1000CsmaP @safe() {
   provides {
     interface Init;
     interface SplitControl;

diff --git a/tos/chips/cc1000/CC1000SendReceiveP.nc b/tos/chips/cc1000/CC1000SendReceiveP.nc
index 19700e066bfe7083e3c3c6d1262fcd3fdafc4655..24781e4f088f9b99205533e00d74d15e664b286d 100644 (file)
--- a/tos/chips/cc1000/CC1000SendReceiveP.nc
+++ b/tos/chips/cc1000/CC1000SendReceiveP.nc
@@ -52,7 +52,7 @@
  * @author David Gay
  */
   
-module CC1000SendReceiveP {
+module CC1000SendReceiveP @safe() {
   provides {
     interface Init;
     interface StdControl;

diff --git a/tos/chips/cc2420/receive/CC2420ReceiveP.nc b/tos/chips/cc2420/receive/CC2420ReceiveP.nc
index fd757be55e6e584f1a59d2d2fc2f7ba7b31bf002..876b1243656c637dad7f62a71728391e9dd9671c 100644 (file)
--- a/tos/chips/cc2420/receive/CC2420ReceiveP.nc
+++ b/tos/chips/cc2420/receive/CC2420ReceiveP.nc
@@ -40,7 +40,7 @@
 #include "message.h"
 #include "AM.h"
 
-module CC2420ReceiveP {
+module CC2420ReceiveP @safe() {
 
   provides interface Init;
   provides interface StdControl;

diff --git a/tos/chips/cc2420/spi/CC2420SpiP.nc b/tos/chips/cc2420/spi/CC2420SpiP.nc
index 8249891960f9c1c409513539066f9868a317e29c..d725e6f0ba48b7f0ab1a353b585867b80a89c056 100644 (file)
--- a/tos/chips/cc2420/spi/CC2420SpiP.nc
+++ b/tos/chips/cc2420/spi/CC2420SpiP.nc
@@ -38,7 +38,7 @@
  * @version $Revision$ $Date$
  */
 
-module CC2420SpiP {
+module CC2420SpiP @safe() {
 
   provides {
     interface ChipSpiResource;

diff --git a/tos/chips/cc2420/transmit/CC2420TransmitP.nc b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
index 7c07cab74feea0c163e7f58b6aad82e0c9787f1d..a571fc70d6d955d1812958bfb7ebe862f21dca6b 100644 (file)
--- a/tos/chips/cc2420/transmit/CC2420TransmitP.nc
+++ b/tos/chips/cc2420/transmit/CC2420TransmitP.nc
@@ -41,7 +41,7 @@
 #include "crc.h"
 #include "message.h"
 
-module CC2420TransmitP {
+module CC2420TransmitP @safe() {
 
   provides interface Init;
   provides interface StdControl;

diff --git a/tos/chips/msp430/adc12/AdcP.nc b/tos/chips/msp430/adc12/AdcP.nc
index f7ae2cb1ecdf9afe193bae827fd5ad1f871b8350..620f480a06784a0d50b657c387d02b9885ab87e7 100644 (file)
--- a/tos/chips/msp430/adc12/AdcP.nc
+++ b/tos/chips/msp430/adc12/AdcP.nc
@@ -33,7 +33,7 @@
  * ========================================================================
  */
 
-module AdcP {
+module AdcP @safe() {
   provides {
     interface Read<uint16_t> as Read[uint8_t client];
     interface ReadNow<uint16_t> as ReadNow[uint8_t client];

diff --git a/tos/chips/msp430/adc12/AdcStreamP.nc b/tos/chips/msp430/adc12/AdcStreamP.nc
index 864f6786cc1fcc9db9b68d79cd2c491f4dc2ee25..7ccc83e681c08ca9ce849edc604980460a2c8592 100644 (file)
--- a/tos/chips/msp430/adc12/AdcStreamP.nc
+++ b/tos/chips/msp430/adc12/AdcStreamP.nc
@@ -43,7 +43,7 @@
  */
 #include "Timer.h"
 
-module AdcStreamP {
+module AdcStreamP @safe() {
   provides {
     interface Init @atleastonce();
     interface ReadStream<uint16_t>[uint8_t client];

diff --git a/tos/chips/msp430/adc12/Msp430Adc12DMAP.nc b/tos/chips/msp430/adc12/Msp430Adc12DMAP.nc
index 9f98dbb81ae2413e33d314d4ded30dea2a10ece2..bd8c8a0acc98a0302810ef5b1103acc29bf81dca 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12DMAP.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12DMAP.nc
@@ -35,7 +35,7 @@
 
 #include <Msp430Adc12.h>
 #include <Msp430Dma.h>
-module Msp430Adc12DMAP 
+module Msp430Adc12DMAP @safe()
 {
   provides {
     interface Msp430Adc12SingleChannel as SingleChannel[uint8_t id];

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
index 65ef88e0781d50ff25a934a8a6425a9d82b9e903..a5df7bfeed65169a6c884943d93a9443e72dab88 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
@@ -34,7 +34,7 @@
  */
 
 #include <Msp430Adc12.h>
-module Msp430Adc12ImplP 
+module Msp430Adc12ImplP @safe()
 {
   provides {
     interface Init;

diff --git a/tos/chips/msp430/dma/HplMsp430DmaXP.nc b/tos/chips/msp430/dma/HplMsp430DmaXP.nc
index 1c3cc2185dec5fc78a0bf904bda1d08d52aba875..82930f9a242b7358a81794ce291b30407a7bd239 100644 (file)
--- a/tos/chips/msp430/dma/HplMsp430DmaXP.nc
+++ b/tos/chips/msp430/dma/HplMsp430DmaXP.nc
@@ -63,7 +63,7 @@ generic module HplMsp430DmaXP( uint16_t DMAxCTL_addr,
                               uint16_t DMAxDA_addr,
                               uint16_t DMAxSZ_addr,
                               uint16_t DMAxTSEL_mask,
-                              uint16_t DMAxTSEL_shift ) {
+                              uint16_t DMAxTSEL_shift ) @safe() {
   
   provides interface HplMsp430DmaChannel as DMA;
   uses interface HplMsp430DmaInterrupt as Interrupt;

diff --git a/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc b/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
index 34debff46c7205c3aeb8089096bbbf50e101343e..38f6f4b576a15bd7f6c06c85353774fd4d7486b4 100644 (file)
--- a/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
+++ b/tos/chips/msp430/pins/HplMsp430GeneralIOP.nc
@@ -31,7 +31,7 @@ generic module HplMsp430GeneralIOP(
                                uint8_t port_dir_addr,
                                uint8_t port_sel_addr,
                                uint8_t pin
-                               )
+                               ) @safe()
 {
   provides interface HplMsp430GeneralIO as IO;
 }

diff --git a/tos/chips/msp430/timer/Msp430TimerCapComP.nc b/tos/chips/msp430/timer/Msp430TimerCapComP.nc
index 5ae8695a62432b2df807dea0758da70a16c6299f..548aecc301f9918be6d1f178f1a9d3871433008d 100644 (file)
--- a/tos/chips/msp430/timer/Msp430TimerCapComP.nc
+++ b/tos/chips/msp430/timer/Msp430TimerCapComP.nc
@@ -28,7 +28,7 @@
 generic module Msp430TimerCapComP(
     uint16_t TxCCTLx_addr,
     uint16_t TxCCRx_addr
-  )
+  ) @safe()
 {
   provides interface Msp430TimerControl as Control;
   provides interface Msp430Compare as Compare;