Remove unnecessary wiring for tmicore and derivative platforms.

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

diff --git a/tos/platforms/tmicore/MoteClockP.nc b/tos/platforms/tmicore/MoteClockP.nc
index 84acca22aea9d278c2628f310c8a3faafff65a5e..68dcdd06e0ec42ddf417ff22ef16846f2106b60a 100644 (file)
--- a/tos/platforms/tmicore/MoteClockP.nc
+++ b/tos/platforms/tmicore/MoteClockP.nc
@@ -28,17 +28,14 @@
  */
  
  /**
- * @author R. Steve McKown <smckown@gmail.com>
+ * @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 {
@@ -61,7 +58,8 @@ implementation {
        BCSCTL2 = SELM_0 | DIVM_0 | DIVS_3;
        DCOCTL = CALDCO_8MHZ;
 
-       /* Turn on TimerB, driven by ACLK */
+       /* Turn on timers A and B */
+       TACTL |= MC_2;
        TBCTL |= MC_2;
       }
       return SUCCESS;
@@ -72,24 +70,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();
-  }
 }