mark more modules as safe code

diff --git a/tos/chips/cc2420/control/CC2420ControlP.nc b/tos/chips/cc2420/control/CC2420ControlP.nc
index 760eafa8d2ecd3ae8f39ac68264b52c833be0eb1..3b144a63307267f918600b853b8f294010d3588d 100644 (file)
--- a/tos/chips/cc2420/control/CC2420ControlP.nc
+++ b/tos/chips/cc2420/control/CC2420ControlP.nc
@@ -38,7 +38,7 @@
 
 #include "Timer.h"
 
-module CC2420ControlP {
+module CC2420ControlP @safe() {
 
   provides interface Init;
   provides interface Resource;

diff --git a/tos/chips/cc2420/csma/CC2420CsmaP.nc b/tos/chips/cc2420/csma/CC2420CsmaP.nc
index 540982f13262d9714185357005c753c0e57e6350..670b718129140bf7be3630637eb90fe3a9bb9622 100644 (file)
--- a/tos/chips/cc2420/csma/CC2420CsmaP.nc
+++ b/tos/chips/cc2420/csma/CC2420CsmaP.nc
@@ -34,7 +34,7 @@
  * @version $Revision$ $Date$
  */
 
-module CC2420CsmaP {
+module CC2420CsmaP @safe() {
 
   provides interface SplitControl;
   provides interface Send;

diff --git a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
index 6c2570c4a5c1f458f2ac4cc789b9a2f0938512b5..e490f37cece3c55e6f3eccbc3ed3a93086037d7e 100644 (file)
--- a/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
+++ b/tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc
@@ -40,7 +40,7 @@
  
 #include "CC2420.h"
 
-module CC2420TinyosNetworkP {
+module CC2420TinyosNetworkP @safe() {
   provides {
     interface Send;
     interface Receive;

diff --git a/tos/chips/msp430/pins/Msp430GpioC.nc b/tos/chips/msp430/pins/Msp430GpioC.nc
index e38ca706fcb178d3113d9a2a1949115f99c7c3d2..dc4995d4899207a87bfa173b1da99821666f3073 100644 (file)
--- a/tos/chips/msp430/pins/Msp430GpioC.nc
+++ b/tos/chips/msp430/pins/Msp430GpioC.nc
@@ -28,7 +28,7 @@
  *          intended use.
  */
 
-generic module Msp430GpioC() {
+generic module Msp430GpioC() @safe() {
   provides interface GeneralIO;
   uses interface HplMsp430GeneralIO as HplGeneralIO;
 }

diff --git a/tos/chips/msp430/timer/GpioCaptureC.nc b/tos/chips/msp430/timer/GpioCaptureC.nc
index 37190d22b58ad9ba30cd5891ee1ffb025ad3cccb..caf9c2bdbdacbededfff9adaaf08b711d9d487bb 100644 (file)
--- a/tos/chips/msp430/timer/GpioCaptureC.nc
+++ b/tos/chips/msp430/timer/GpioCaptureC.nc
@@ -24,7 +24,7 @@
  * @author Joe Polastre
  */
 
-generic module GpioCaptureC() {
+generic module GpioCaptureC() @safe() {
 
   provides interface GpioCapture as Capture;
   uses interface Msp430TimerControl;

diff --git a/tos/chips/msp430/timer/Msp430AlarmC.nc b/tos/chips/msp430/timer/Msp430AlarmC.nc
index 1a781107faf43a6bd2d44e86e8ef8f57767e3be8..834204cf9056eb30f25c2162daeb94c4bb1c0381 100644 (file)
--- a/tos/chips/msp430/timer/Msp430AlarmC.nc
+++ b/tos/chips/msp430/timer/Msp430AlarmC.nc
@@ -29,7 +29,7 @@
  *          intended use.
  */
 
-generic module Msp430AlarmC(typedef frequency_tag)
+generic module Msp430AlarmC(typedef frequency_tag) @safe()
 {
   provides interface Init;
   provides interface Alarm<frequency_tag,uint16_t> as Alarm;

diff --git a/tos/chips/msp430/timer/Msp430CounterC.nc b/tos/chips/msp430/timer/Msp430CounterC.nc
index c6f31ffacf83dec057d09153b9f2c1c5db0b9b79..e380f359dc4e3227343964bf43fc5c7ad7b24689 100644 (file)
--- a/tos/chips/msp430/timer/Msp430CounterC.nc
+++ b/tos/chips/msp430/timer/Msp430CounterC.nc
@@ -28,7 +28,7 @@
  *          intended use.
  */
  
-generic module Msp430CounterC( typedef frequency_tag )
+generic module Msp430CounterC( typedef frequency_tag ) @safe()
 {
   provides interface Counter<frequency_tag,uint16_t> as Counter;
   uses interface Msp430Timer;

diff --git a/tos/chips/msp430/timer/Msp430TimerP.nc b/tos/chips/msp430/timer/Msp430TimerP.nc
index 0a40de8052420dff1e8c63a0ad493d11a9bdae43..949654201a4d563e526b7be4ff6721fe1734b028 100644 (file)
--- a/tos/chips/msp430/timer/Msp430TimerP.nc
+++ b/tos/chips/msp430/timer/Msp430TimerP.nc
@@ -34,7 +34,7 @@ generic module Msp430TimerP(
   uint16_t TxIE,
   uint16_t TxSSEL0,
   uint16_t TxSSEL1,
-  bool isClockSourceAsync )
+  bool isClockSourceAsync ) @safe()
 {
   provides interface Msp430Timer as Timer;
   provides interface Msp430TimerEvent as Event[uint8_t n];

diff --git a/tos/lib/timer/CounterToLocalTimeC.nc b/tos/lib/timer/CounterToLocalTimeC.nc
index 07dc6e3510db4999edc99913e509005550705d3d..969308f668fbb8afa32b32a2b1053d1dae1d3f62 100644 (file)
--- a/tos/lib/timer/CounterToLocalTimeC.nc
+++ b/tos/lib/timer/CounterToLocalTimeC.nc
@@ -32,7 +32,7 @@
  * @author Cory Sharp <cssharp@eecs.berkeley.edu>
  */
 
-generic module CounterToLocalTimeC(typedef precision_tag)
+generic module CounterToLocalTimeC(typedef precision_tag) @safe()
 {
   provides interface LocalTime<precision_tag>;
   uses interface Counter<precision_tag,uint32_t>;

diff --git a/tos/lib/timer/TransformAlarmC.nc b/tos/lib/timer/TransformAlarmC.nc
index 0915ff38d52cfbf2913556f91a96d250c93c1824..09c23a5ea2d0e143069d588e016e16fc861a5806 100644 (file)
--- a/tos/lib/timer/TransformAlarmC.nc
+++ b/tos/lib/timer/TransformAlarmC.nc
@@ -42,7 +42,7 @@ generic module TransformAlarmC(
   typedef to_size_type @integer(),
   typedef from_precision_tag,
   typedef from_size_type @integer(),
-  uint8_t bit_shift_right)
+  uint8_t bit_shift_right) @safe()
 {
   /**
    * The transformed Alarm.

diff --git a/tos/lib/timer/TransformCounterC.nc b/tos/lib/timer/TransformCounterC.nc
index 53752f0d587352288698e1353d96e1e698b541a9..99d23a21ae60c6b802bb21ba2d87d764ddae5160 100644 (file)
--- a/tos/lib/timer/TransformCounterC.nc
+++ b/tos/lib/timer/TransformCounterC.nc
@@ -46,7 +46,7 @@ generic module TransformCounterC(
   typedef from_precision_tag,
   typedef from_size_type @integer(),
   uint8_t bit_shift_right,
-  typedef upper_count_type @integer())
+  typedef upper_count_type @integer()) @safe()
 {
   provides interface Counter<to_precision_tag,to_size_type> as Counter;
   uses interface Counter<from_precision_tag,from_size_type> as CounterFrom;