4 files changed, 11 insertions, 3 deletions
diff --git a/demos/MSP430-MSP430x1611-GCC/Makefile b/demos/MSP430-MSP430x1611-GCC/Makefile
index 4d2b01bd3..097300911 100644
--- a/demos/MSP430-MSP430x1611-GCC/Makefile
+++ b/demos/MSP430-MSP430x1611-GCC/Makefile
@@ -67,6 +67,7 @@ include ../../test/test.mk
 
 # List ARM-mode C source files here
 SRC = ../../ports/MSP430/chcore.c \
+      ../../ports/MSP430/msp430_serial.c \
        ${KERNSRC} \
        ${TESTSRC} \
       ../../src/lib/evtimer.c \
diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index caef10720..e6ae187da 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -21,6 +21,7 @@
 #include <signal.h>
 
 #include "board.h"
+#include "msp430_serial.h"
 
 /*
  * Hardware initialization goes here.
@@ -77,6 +78,11 @@ void hwinit(void) {
   TACTL = TACLR;                        /* Clean start.                 */
   TACTL = TASSEL_2 | MC_1;              /* Src=SMCLK, cmp=TACCR0.       */
   TACCTL0 = CCIE;                       /* Interrupt on compare.        */
+
+  /*
+   * Other subsystems.
+   */
+  InitSerial();
 }
 
 interrupt(TIMERA0_VECTOR) tmr0irq(void) {
diff --git a/demos/MSP430-MSP430x1611-GCC/board.h b/demos/MSP430-MSP430x1611-GCC/board.h
index d72da9c2c..f7173f712 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.h
+++ b/demos/MSP430-MSP430x1611-GCC/board.h
@@ -34,7 +34,7 @@
 
 #define LFXT1CLK        32768
 #define XT2CLK          8000000
-#define DCOCLK          1000000
+#define DCOCLK          750000
 
 #define ACLK            LFXT1CLK
 #if defined(MSP_USE_XT2CLK)
diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c
index 72736fc54..19ffacf7f 100644
--- a/demos/MSP430-MSP430x1611-GCC/main.c
+++ b/demos/MSP430-MSP430x1611-GCC/main.c
@@ -21,6 +21,7 @@
 #include <test.h>
 
 #include "board.h"
+#include "msp430_serial.h"
 
 /*
  * Red LEDs blinker thread, times are in milliseconds.
@@ -63,8 +64,8 @@ int main(int argc, char **argv) {
    * sleeping in a loop.
    */
   while (TRUE) {
-//    if (!(P6IN & P6_I_BUTTON))
-//      TestThread(&COM1);
+    if (!(P6IN & P6_I_BUTTON))
+      TestThread(&COM1);
     chThdSleep(500);
   }
   return 0;