From 13f5b1b97fa1ca9516665807682c164aa926fb78 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sun, 19 Dec 2010 10:50:04 +0000 Subject: MSP430 board files and demo updated. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2502 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/MSP430-MSP430x1611-GCC/main.c | 11 ++++++++--- demos/MSP430-MSP430x1611-GCC/mcuconf.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'demos') diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c index 3bac249d0..c010b89b3 100644 --- a/demos/MSP430-MSP430x1611-GCC/main.c +++ b/demos/MSP430-MSP430x1611-GCC/main.c @@ -38,7 +38,7 @@ static msg_t Thread1(void *arg) { } /* - * Entry point, the interrupts are disabled on entry. + * Application entry point. */ int main(int argc, char **argv) { @@ -46,9 +46,14 @@ int main(int argc, char **argv) { (void)argv; /* - * Hardware initialization, see board.c. + * System initializations. + * - HAL initialization, this also initializes the configured device drivers + * and performs the board-specific initializations. + * - Kernel initialization, the main() function becomes a thread and the + * RTOS is active. */ - hwinit(); + halInit(); + chSysInit(); /* * Activates the serial driver 2 using the driver default configuration. diff --git a/demos/MSP430-MSP430x1611-GCC/mcuconf.h b/demos/MSP430-MSP430x1611-GCC/mcuconf.h index 72c180648..c79252c86 100644 --- a/demos/MSP430-MSP430x1611-GCC/mcuconf.h +++ b/demos/MSP430-MSP430x1611-GCC/mcuconf.h @@ -28,7 +28,7 @@ /* * HAL driver system settings. */ -#define MSP430_USE_CLOCK MSP430_CLOCK_SOURCE_XT2CLK +#define MSP430_USE_CLOCK MSP430_CLOCK_SOURCE_DCOCLK /* * ADC driver system settings. -- cgit v1.2.3