From 6fdb498e6d4a8192b61e9e98045485cb23b9a74a Mon Sep 17 00:00:00 2001
From: regehr <regehr>
Date: Tue, 24 Jun 2008 04:07:28 +0000
Subject: [PATCH] mark more modules as safe code

---
 tos/chips/cc2420/control/CC2420ControlP.nc      | 2 +-
 tos/chips/cc2420/csma/CC2420CsmaP.nc            | 2 +-
 tos/chips/cc2420/lowpan/CC2420TinyosNetworkP.nc | 2 +-
 tos/chips/msp430/pins/Msp430GpioC.nc            | 2 +-
 tos/chips/msp430/timer/GpioCaptureC.nc          | 2 +-
 tos/chips/msp430/timer/Msp430AlarmC.nc          | 2 +-
 tos/chips/msp430/timer/Msp430CounterC.nc        | 2 +-
 tos/chips/msp430/timer/Msp430TimerP.nc          | 2 +-
 tos/lib/timer/CounterToLocalTimeC.nc            | 2 +-
 tos/lib/timer/TransformAlarmC.nc                | 2 +-
 tos/lib/timer/TransformCounterC.nc              | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tos/chips/cc2420/control/CC2420ControlP.nc b/tos/chips/cc2420/control/CC2420ControlP.nc
index 760eafa8..3b144a63 100644
--- 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 540982f1..670b7181 100644
--- 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 6c2570c4..e490f37c 100644
--- 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 e38ca706..dc4995d4 100644
--- 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 37190d22..caf9c2bd 100644
--- 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 1a781107..834204cf 100644
--- 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 c6f31ffa..e380f359 100644
--- 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 0a40de80..94965420 100644
--- 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 07dc6e35..969308f6 100644
--- 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 0915ff38..09c23a5e 100644
--- 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 53752f0d..99d23a21 100644
--- 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;
-- 
2.39.2