From 4061448082666ea587f63183d5e69775e7c4ffda Mon Sep 17 00:00:00 2001 From: regehr Date: Thu, 26 Jun 2008 03:38:26 +0000 Subject: [PATCH] mark a few more modules as safe code; this cannot affect unsafe compilation --- apps/Blink/BlinkC.nc | 2 +- tos/chips/atm128/McuSleepC.nc | 2 +- tos/chips/atm128/timer/Atm128AlarmAsyncP.nc | 2 +- tos/chips/atm128/timer/HplAtm128Timer0AsyncP.nc | 2 +- tos/chips/msp430/McuSleepC.nc | 2 +- tos/chips/msp430/timer/Msp430TimerCommonP.nc | 2 +- tos/platforms/mica/MeasureClockC.nc | 2 +- tos/platforms/mica/PlatformP.nc | 2 +- tos/platforms/micaz/MotePlatformP.nc | 2 +- tos/system/RealMainP.nc | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/Blink/BlinkC.nc b/apps/Blink/BlinkC.nc index 90c4b264..ce177128 100644 --- a/apps/Blink/BlinkC.nc +++ b/apps/Blink/BlinkC.nc @@ -36,7 +36,7 @@ #include "Timer.h" -module BlinkC +module BlinkC @safe() { uses interface Timer as Timer0; uses interface Timer as Timer1; diff --git a/tos/chips/atm128/McuSleepC.nc b/tos/chips/atm128/McuSleepC.nc index badcfed0..9d03201e 100644 --- a/tos/chips/atm128/McuSleepC.nc +++ b/tos/chips/atm128/McuSleepC.nc @@ -37,7 +37,7 @@ * @date October 26, 2005 */ -module McuSleepC { +module McuSleepC @safe() { provides { interface McuSleep; interface McuPowerState; diff --git a/tos/chips/atm128/timer/Atm128AlarmAsyncP.nc b/tos/chips/atm128/timer/Atm128AlarmAsyncP.nc index c5b80b41..3eb2c202 100644 --- a/tos/chips/atm128/timer/Atm128AlarmAsyncP.nc +++ b/tos/chips/atm128/timer/Atm128AlarmAsyncP.nc @@ -20,7 +20,7 @@ * * @author David Gay */ -generic module Atm128AlarmAsyncP(typedef precision, int divider) { +generic module Atm128AlarmAsyncP(typedef precision, int divider) @safe() { provides { interface Init; interface Alarm; diff --git a/tos/chips/atm128/timer/HplAtm128Timer0AsyncP.nc b/tos/chips/atm128/timer/HplAtm128Timer0AsyncP.nc index eb2c0bfb..95854a42 100644 --- a/tos/chips/atm128/timer/HplAtm128Timer0AsyncP.nc +++ b/tos/chips/atm128/timer/HplAtm128Timer0AsyncP.nc @@ -34,7 +34,7 @@ #include -module HplAtm128Timer0AsyncP { +module HplAtm128Timer0AsyncP @safe() { provides { // 8-bit Timers interface HplAtm128Timer as Timer; diff --git a/tos/chips/msp430/McuSleepC.nc b/tos/chips/msp430/McuSleepC.nc index 64c87a7e..369737c8 100644 --- a/tos/chips/msp430/McuSleepC.nc +++ b/tos/chips/msp430/McuSleepC.nc @@ -38,7 +38,7 @@ * */ -module McuSleepC { +module McuSleepC @safe() { provides { interface McuSleep; interface McuPowerState; diff --git a/tos/chips/msp430/timer/Msp430TimerCommonP.nc b/tos/chips/msp430/timer/Msp430TimerCommonP.nc index 64c27704..b90c7016 100644 --- a/tos/chips/msp430/timer/Msp430TimerCommonP.nc +++ b/tos/chips/msp430/timer/Msp430TimerCommonP.nc @@ -1,5 +1,5 @@ -module Msp430TimerCommonP +module Msp430TimerCommonP @safe() { provides interface Msp430TimerEvent as VectorTimerA0; provides interface Msp430TimerEvent as VectorTimerA1; diff --git a/tos/platforms/mica/MeasureClockC.nc b/tos/platforms/mica/MeasureClockC.nc index 898d8018..fa82bbba 100644 --- a/tos/platforms/mica/MeasureClockC.nc +++ b/tos/platforms/mica/MeasureClockC.nc @@ -19,7 +19,7 @@ * @author David Gay */ -module MeasureClockC { +module MeasureClockC @safe() { provides { /** * This code MUST be called from PlatformP only, hence the exactlyonce. diff --git a/tos/platforms/mica/PlatformP.nc b/tos/platforms/mica/PlatformP.nc index 48d0fc06..a7970189 100644 --- a/tos/platforms/mica/PlatformP.nc +++ b/tos/platforms/mica/PlatformP.nc @@ -30,7 +30,7 @@ #include "hardware.h" -module PlatformP +module PlatformP @safe() { provides interface Init; uses interface Init as MoteInit; diff --git a/tos/platforms/micaz/MotePlatformP.nc b/tos/platforms/micaz/MotePlatformP.nc index a45787ea..fec5f692 100644 --- a/tos/platforms/micaz/MotePlatformP.nc +++ b/tos/platforms/micaz/MotePlatformP.nc @@ -15,7 +15,7 @@ * * @author David Gay */ -module MotePlatformP +module MotePlatformP @safe() { provides interface Init as PlatformInit; uses interface GeneralIO as SerialIdPin; diff --git a/tos/system/RealMainP.nc b/tos/system/RealMainP.nc index 6f1306c2..37fb3f18 100644 --- a/tos/system/RealMainP.nc +++ b/tos/system/RealMainP.nc @@ -42,7 +42,7 @@ * @date January 17 2005 */ -module RealMainP { +module RealMainP @safe() { provides interface Boot; uses interface Scheduler; uses interface Init as PlatformInit; -- 2.39.2