X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fplatforms%2Ftmicore%2FMoteClockP.nc;h=ca169f2758f1ec079134cef2b355f1377dd0c402;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=3502a0a4f9c58b7fa996463933697626489ecec8;hpb=ea919e632db754746366a851e66c6d04c3959a93;p=tinyos-2.x.git

diff --git a/tos/platforms/tmicore/MoteClockP.nc b/tos/platforms/tmicore/MoteClockP.nc
index 3502a0a4..ca169f27 100644
--- a/tos/platforms/tmicore/MoteClockP.nc
+++ b/tos/platforms/tmicore/MoteClockP.nc
@@ -26,25 +26,16 @@
  * (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 <smckown@gmail.com>
+ * @author R. Steve McKown <rsmckown@gmail.com>
  */
- 
-//#include "msp430hardware.h"
-#include "Msp430Timer.h"
 
-#define MS430DCOSPEC_H
-#define TARGET_DCO_KHZ 8192 // the target DCO clock rate in binary kHz
-//#define TARGET_DCO_KHZ 4096 // the target DCO clock rate in binary kHz
-#define ACLK_KHZ 32 // the ACLK rate in binary kHz
+#include "Msp430Timer.h"
 
 module MoteClockP {
   provides interface Init;
-  uses {
-    interface Init as SubInit;
-    interface Msp430ClockInit;
-  }
+  uses interface Init as SubInit;
 }
 
 implementation {
@@ -67,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;
@@ -78,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();
-  }
 }