mark more modules as safe code

diff --git a/apps/RadioCountToLeds/RadioCountToLedsC.nc b/apps/RadioCountToLeds/RadioCountToLedsC.nc
index fcc3c7c69ef5846b761cdc612cf891f511d672fe..be2b4886aae86bd04af9b0b6b6fea6f87b9419a9 100644 (file)
--- a/apps/RadioCountToLeds/RadioCountToLedsC.nc
+++ b/apps/RadioCountToLeds/RadioCountToLedsC.nc
@@ -43,7 +43,7 @@
  * @date   June 6 2005
  */
 
-module RadioCountToLedsC {
+module RadioCountToLedsC @safe() {
   uses {
     interface Leds;
     interface Boot;

diff --git a/tos/chips/cc2420/CC2420ActiveMessageP.nc b/tos/chips/cc2420/CC2420ActiveMessageP.nc
index 374f1dad32faa4e1e931f0dc7e9824bc78455b03..be40963711905e0cd6ab4cc049dbf23c8fa3ee30 100644 (file)
--- a/tos/chips/cc2420/CC2420ActiveMessageP.nc
+++ b/tos/chips/cc2420/CC2420ActiveMessageP.nc
@@ -34,7 +34,7 @@
  
 #include "CC2420.h"
 
-module CC2420ActiveMessageP {
+module CC2420ActiveMessageP @safe() {
   provides {
     interface AMSend[am_id_t id];
     interface Receive[am_id_t id];

diff --git a/tos/chips/cc2420/packet/CC2420PacketP.nc b/tos/chips/cc2420/packet/CC2420PacketP.nc
index 41002d5b37637f8fad706d2b2e4434019ca6cde4..9bca8ae494773663209a225723ed2b9b9282401e 100644 (file)
--- a/tos/chips/cc2420/packet/CC2420PacketP.nc
+++ b/tos/chips/cc2420/packet/CC2420PacketP.nc
@@ -39,7 +39,7 @@
 #include "message.h"
 #include "CC2420.h"
 
-module CC2420PacketP {
+module CC2420PacketP @safe() {
 
   provides {
     interface CC2420Packet;

diff --git a/tos/chips/cc2420/unique/UniqueReceiveP.nc b/tos/chips/cc2420/unique/UniqueReceiveP.nc
index 69aabcb8059dd9a85afd1478aaee0d9d4a5c61a2..445848ea7d4151f0a1f1c1f4939d18e981b988cb 100644 (file)
--- a/tos/chips/cc2420/unique/UniqueReceiveP.nc
+++ b/tos/chips/cc2420/unique/UniqueReceiveP.nc
@@ -38,7 +38,7 @@
  
 #include "CC2420.h"
 
-module UniqueReceiveP {
+module UniqueReceiveP @safe() {
   provides {
     interface Receive;
     interface Receive as DuplicateReceive;

diff --git a/tos/chips/cc2420/unique/UniqueSendP.nc b/tos/chips/cc2420/unique/UniqueSendP.nc
index 7b68edfe2a1efc41dbdf7df1310585b1cf332d10..64cbfda0a5a555d992fd89c2b8838709d60ac78b 100644 (file)
--- a/tos/chips/cc2420/unique/UniqueSendP.nc
+++ b/tos/chips/cc2420/unique/UniqueSendP.nc
@@ -35,7 +35,7 @@
  * @author David Moss
  */
  
-module UniqueSendP {
+module UniqueSendP @safe() {
   provides {
     interface Send;
     interface Init;

diff --git a/tos/chips/msp430/pins/HplMsp430InterruptP.nc b/tos/chips/msp430/pins/HplMsp430InterruptP.nc
index 9b1b1f2194f11621c54a0228b1c7ecb98a21b74e..2691845605306a1fb32cbfa56c032fe169ecc951 100644 (file)
--- a/tos/chips/msp430/pins/HplMsp430InterruptP.nc
+++ b/tos/chips/msp430/pins/HplMsp430InterruptP.nc
@@ -22,7 +22,7 @@
 /**
  * @author Joe Polastre
  */
-module HplMsp430InterruptP
+module HplMsp430InterruptP @safe()
 {
 #ifdef __msp430_have_port1
   provides interface HplMsp430Interrupt as Port10;

diff --git a/tos/chips/msp430/timer/Msp430ClockP.nc b/tos/chips/msp430/timer/Msp430ClockP.nc
index 080facc7a4963be230e4c8d1134b3da6869ecf72..55aaba33203581bdff602e1b62d393355f5fe05b 100644 (file)
--- a/tos/chips/msp430/timer/Msp430ClockP.nc
+++ b/tos/chips/msp430/timer/Msp430ClockP.nc
@@ -29,7 +29,7 @@
 
 #include "Msp430Timer.h"
 
-module Msp430ClockP
+module Msp430ClockP @safe()
 {
   provides interface Init;
   provides interface Msp430ClockInit;

diff --git a/tos/chips/msp430/usart/HplMsp430I2C0P.nc b/tos/chips/msp430/usart/HplMsp430I2C0P.nc
index 3279016ce3c36b166bed5ee09ac6fa080b852df9..72bdbe4e0e3375fe40d2749bcb6fa0550fda33b2 100644 (file)
--- a/tos/chips/msp430/usart/HplMsp430I2C0P.nc
+++ b/tos/chips/msp430/usart/HplMsp430I2C0P.nc
@@ -34,7 +34,7 @@
  * @version $Revision$ $Date$
  */
 
-module HplMsp430I2C0P {
+module HplMsp430I2C0P @safe() {
   
   provides interface HplMsp430I2C as HplI2C;
   

diff --git a/tos/chips/msp430/usart/HplMsp430Usart0P.nc b/tos/chips/msp430/usart/HplMsp430Usart0P.nc
index cf618bfbbdba8cc75855497c1102b256380c6293..df07cd472ca5cee0c2d54f1ed0cece78d28ea34d 100644 (file)
--- a/tos/chips/msp430/usart/HplMsp430Usart0P.nc
+++ b/tos/chips/msp430/usart/HplMsp430Usart0P.nc
@@ -71,7 +71,7 @@
  * @version $Revision$ $Date$
  */
 
-module HplMsp430Usart0P {
+module HplMsp430Usart0P @safe() {
   provides interface HplMsp430Usart as Usart;
   provides interface HplMsp430UsartInterrupts as Interrupts;
   provides interface HplMsp430I2CInterrupts as I2CInterrupts;

diff --git a/tos/lib/timer/AlarmToTimerC.nc b/tos/lib/timer/AlarmToTimerC.nc
index 64b9ea1cebbe65a9d4c4ab863c42725b47fde6f5..2bdecc6378f507e1f31e28a9353c5183bbd2d7b2 100644 (file)
--- a/tos/lib/timer/AlarmToTimerC.nc
+++ b/tos/lib/timer/AlarmToTimerC.nc
@@ -32,7 +32,7 @@
  * @author Cory Sharp <cssharp@eecs.berkeley.edu>
  */
 
-generic module AlarmToTimerC(typedef precision_tag)
+generic module AlarmToTimerC(typedef precision_tag) @safe()
 {
   provides interface Timer<precision_tag>;
   uses interface Alarm<precision_tag,uint32_t>;

diff --git a/tos/lib/timer/VirtualizeTimerC.nc b/tos/lib/timer/VirtualizeTimerC.nc
index 4aa7c222ccf3b1c6bd0f88276ee0328aa9a2ff91..4f3f109bf5f9f72dd649fbdcfd3a2be74ca27b95 100644 (file)
--- a/tos/lib/timer/VirtualizeTimerC.nc
+++ b/tos/lib/timer/VirtualizeTimerC.nc
@@ -32,7 +32,7 @@
  * @author Cory Sharp <cssharp@eecs.berkeley.edu>
  */
 
-generic module VirtualizeTimerC(typedef precision_tag, int max_timers)
+generic module VirtualizeTimerC(typedef precision_tag, int max_timers) @safe()
 {
   provides interface Timer<precision_tag> as Timer[uint8_t num];
   uses interface Timer<precision_tag> as TimerFrom;

diff --git a/tos/platforms/telosa/PlatformP.nc b/tos/platforms/telosa/PlatformP.nc
index 93c1b6fdb7941fc996e017f1cd0799918d3507d9..34490d6526c354aecf24abb12e91723b6ab57cb2 100644 (file)
--- a/tos/platforms/telosa/PlatformP.nc
+++ b/tos/platforms/telosa/PlatformP.nc
@@ -1,6 +1,6 @@
 #include "hardware.h"
 
-module PlatformP{
+module PlatformP @safe() {
   provides interface Init;
   uses interface Init as MoteClockInit;
   uses interface Init as MoteInit;

diff --git a/tos/platforms/telosb/MotePlatformC.nc b/tos/platforms/telosb/MotePlatformC.nc
index 623144f35b1c9bc7d68e45a9755f4e6e0a075f33..1ba21eac660db8dc594e9d72d3aa32240167e9aa 100644 (file)
--- a/tos/platforms/telosb/MotePlatformC.nc
+++ b/tos/platforms/telosb/MotePlatformC.nc
@@ -1,4 +1,4 @@
-module MotePlatformC {
+module MotePlatformC @safe() {
   provides interface Init;
 }
 implementation {

diff --git a/tos/system/AMQueueEntryP.nc b/tos/system/AMQueueEntryP.nc
index 2f96c3941778a0029547d8a16e578c98306a6454..0cd9b185df49a3168a18e2ce961dd6a6c4e80995 100644 (file)
--- a/tos/system/AMQueueEntryP.nc
+++ b/tos/system/AMQueueEntryP.nc
@@ -32,7 +32,7 @@
 
 #include "AM.h"
 
-generic module AMQueueEntryP(am_id_t amId) {
+generic module AMQueueEntryP(am_id_t amId) @safe() {
   provides interface AMSend;
   uses{
     interface Send;

diff --git a/tos/system/AMQueueImplP.nc b/tos/system/AMQueueImplP.nc
index 02e41d77e7f22cd75a05852f5a9fdc07f84193c2..a4c4eaf5ec0be268ffeac5339cb28dcdc5f9ef7f 100644 (file)
--- a/tos/system/AMQueueImplP.nc
+++ b/tos/system/AMQueueImplP.nc
@@ -34,7 +34,7 @@
 
 #include "AM.h"
 
-generic module AMQueueImplP(int numClients) {
+generic module AMQueueImplP(int numClients) @safe() {
     provides interface Send[uint8_t client];
     uses{
         interface AMSend[am_id_t id];

diff --git a/tos/system/ActiveMessageAddressC.nc b/tos/system/ActiveMessageAddressC.nc
index b7cb3ea1915a0a90b09415bcd5bd13191519357d..ae0aafbf510e05a750914104ef61e11532f508b4 100644 (file)
--- a/tos/system/ActiveMessageAddressC.nc
+++ b/tos/system/ActiveMessageAddressC.nc
@@ -38,7 +38,7 @@
  * @author David Moss
  */
 
-module ActiveMessageAddressC  {
+module ActiveMessageAddressC @safe() {
   provides {
     interface ActiveMessageAddress;
     async command am_addr_t amAddress();

diff --git a/tos/system/ArbiterP.nc b/tos/system/ArbiterP.nc
index bffe84c05e6a024cb77dea6d1e3e578760f893a1..f7b2fcedab33f221b78ada452ab1a10c46efed2f 100644 (file)
--- a/tos/system/ArbiterP.nc
+++ b/tos/system/ArbiterP.nc
@@ -49,7 +49,7 @@
  * @author Philip Levis
  */
  
-generic module ArbiterP(uint8_t default_owner_id) {
+generic module ArbiterP(uint8_t default_owner_id) @safe() {
   provides {
     interface Resource[uint8_t id];
     interface ResourceRequested[uint8_t id];

diff --git a/tos/system/FcfsResourceQueueC.nc b/tos/system/FcfsResourceQueueC.nc
index 7be5ed485a22f819d6247418a098ce601f9f0115..565ba25fca0f96297bf7b7c4ad4ef81b1a92c41e 100644 (file)
--- a/tos/system/FcfsResourceQueueC.nc
+++ b/tos/system/FcfsResourceQueueC.nc
@@ -29,7 +29,7 @@
  
 #include "Resource.h"
  
-generic module FcfsResourceQueueC(uint8_t size) {
+generic module FcfsResourceQueueC(uint8_t size) @safe() {
   provides {
     interface Init;
     interface ResourceQueue as FcfsQueue;

diff --git a/tos/system/LedsP.nc b/tos/system/LedsP.nc
index a261cd9e12e0e074aba52e676b2ea0731667fd65..3a3d4814000fde75b1613638e4cdc421843d3202 100644 (file)
--- a/tos/system/LedsP.nc
+++ b/tos/system/LedsP.nc
@@ -30,7 +30,7 @@
  * @date   March 21, 2005
  */
 
-module LedsP {
+module LedsP @safe() {
   provides {
     interface Init;
     interface Leds;

diff --git a/tos/system/RandomMlcgC.nc b/tos/system/RandomMlcgC.nc
index 25a2b6c06c8fc3846bc980a0b427719509858a58..3e6a3f411917a6dcebca3564464f247642e32800 100644 (file)
--- a/tos/system/RandomMlcgC.nc
+++ b/tos/system/RandomMlcgC.nc
@@ -31,7 +31,7 @@
  * @date   March 1 2005
  */
 
-module RandomMlcgC {
+module RandomMlcgC @safe() {
   provides interface Init;
   provides interface ParameterInit<uint16_t> as SeedInit;
   provides interface Random;

diff --git a/tos/system/SchedulerBasicP.nc b/tos/system/SchedulerBasicP.nc
index 983b231527ea946015996991f3423eb237f9cd4c..d80968ed473120cf16f53ea35d6268a644a8a01c 100644 (file)
--- a/tos/system/SchedulerBasicP.nc
+++ b/tos/system/SchedulerBasicP.nc
@@ -40,7 +40,7 @@
 
 #include "hardware.h"
 
-module SchedulerBasicP {
+module SchedulerBasicP @safe() {
   provides interface Scheduler;
   provides interface TaskBasic[uint8_t id];
   uses interface McuSleep;

diff --git a/tos/system/StateImplP.nc b/tos/system/StateImplP.nc
index cfd5d5d47e23c018d9531a3b53069aaa195f0f52..3883ac15012ab47f6dfafc82adbdd9a07bafd477 100644 (file)
--- a/tos/system/StateImplP.nc
+++ b/tos/system/StateImplP.nc
@@ -61,7 +61,7 @@
  
 #include "State.h"
  
-module StateImplP {
+module StateImplP @safe() {
   provides {
        interface Init;
     interface State[uint8_t id];