Updates for GCC 4.5.3

[tinyos-2.x.git] / tos / platforms / tmicore / MoteClockP.nc

diff --git a/tos/platforms/tmicore/MoteClockP.nc b/tos/platforms/tmicore/MoteClockP.nc
index 6b5359af5e7e6426914cd6d8b54f38b41a50646f..a3353972854fe9a639a7208464269bf4e733a28e 100644 (file)
--- a/tos/platforms/tmicore/MoteClockP.nc
+++ b/tos/platforms/tmicore/MoteClockP.nc
@@ -26,25 +26,25 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
  /**
  * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
+
 #include "Msp430Timer.h"
 
 module MoteClockP {
   provides interface Init;
-  uses {
-    interface Init as SubInit;
-    interface Msp430ClockInit;
-  }
+  uses interface Init as SubInit;
 }
 
 implementation {
+  MSP430REG_NORACE(TAIV);
+  MSP430REG_NORACE(TBIV);
+
   command error_t Init.init()
   {
-    uint16_t i;
+    volatile uint16_t i;
 
 #if defined (CALDCO_8MHZ_) && !defined(__DisableCalData)
     if (CALBC1_8MHZ != 0xff || CALDCO_8MHZ != 0xff) {
@@ -73,24 +73,4 @@ implementation {
     for (i = 0; i < 0xfffe; i++); /* ensure LFXT1 is stable */
     return call SubInit.init();
   }
-
-  event void Msp430ClockInit.setupDcoCalibrate()
-  {
-    call Msp430ClockInit.defaultSetupDcoCalibrate();
-  }
-
-  event void Msp430ClockInit.initClocks()
-  {
-    call Msp430ClockInit.defaultInitClocks();
-  }
-
-  event void Msp430ClockInit.initTimerA()
-  {
-    call Msp430ClockInit.defaultInitTimerA();
-  }
-
-  event void Msp430ClockInit.initTimerB()
-  {
-    call Msp430ClockInit.defaultInitTimerB();
-  }
 }