git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@286 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 7 insertions, 4 deletions

diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index b591ec3d6..c6cfedce2 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -63,11 +63,11 @@ void hwinit(void) {
   P6SEL = VAL_P6SEL;

 

   /*

-   * Timer 0 setup.

+   * Timer 0 setup, uses SMCLK as source.

    */

-  TACCR0 = ACLK / CH_FREQUENCY - 1;     /* Counter limit.               */

+  TACCR0 = SMCLK / CH_FREQUENCY - 1;    /* Counter limit.               */

   TACTL = TACLR;                        /* Clean start.                 */

-  TACTL = TASSEL_1 | MC_1;              /* Src=ACLK, cmp=TACCR0.        */

+  TACTL = TASSEL_2 | MC_1;              /* Src=SMCLK, cmp=TACCR0.       */

   TACCTL0 = CCIE;                       /* Interrupt on compare.        */

 }

 

diff --git a/demos/MSP430-MSP430x1611-GCC/board.h b/demos/MSP430-MSP430x1611-GCC/board.h
index fe4523b6a..8b335f64f 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.h
+++ b/demos/MSP430-MSP430x1611-GCC/board.h
@@ -22,6 +22,9 @@
 

 #include <msp430x16x.h>

 

+/*

+ * Clock settings.

+ */

 #define MSP_USE_XT2CLK

 

 #define LFXT1CLK        32768

@@ -34,7 +37,7 @@
 #define SMCLK           (XT2CLK / 8)

 #else

 #define MCLK            DCOCLK

-#define SMCLK           LFXT1CLK

+#define SMCLK           DCOCLK

 #endif

 

 #define VAL_DCOCTL      (DCO0 | DCO1)