diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:50:04 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:50:04 +0000 |
| commit | 13f5b1b97fa1ca9516665807682c164aa926fb78 (patch) | |
| tree | 4d902ed2922815ec38effc996442bd588d77408c /boards/OLIMEX_MSP430_P1611 | |
| parent | ace3f844709b1bfdd4c88acbc943bdecf29f9f21 (diff) | |
| download | ChibiOS-13f5b1b97fa1ca9516665807682c164aa926fb78.tar.gz ChibiOS-13f5b1b97fa1ca9516665807682c164aa926fb78.tar.bz2 ChibiOS-13f5b1b97fa1ca9516665807682c164aa926fb78.zip | |
MSP430 board files and demo updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2502 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'boards/OLIMEX_MSP430_P1611')
| -rw-r--r-- | boards/OLIMEX_MSP430_P1611/board.c | 10 | ||||
| -rw-r--r-- | boards/OLIMEX_MSP430_P1611/board.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/boards/OLIMEX_MSP430_P1611/board.c b/boards/OLIMEX_MSP430_P1611/board.c index 072b1dd5a..558110376 100644 --- a/boards/OLIMEX_MSP430_P1611/board.c +++ b/boards/OLIMEX_MSP430_P1611/board.c @@ -61,15 +61,9 @@ CH_IRQ_HANDLER(TIMERA0_VECTOR) { }
/*
- * Hardware initialization goes here.
- * NOTE: Interrupts are still disabled.
+ * Board-specific initialization code.
*/
-void hwinit(void) {
-
- /*
- * HAL initialization.
- */
- halInit();
+void boardInit(void) {
/*
* Timer 0 setup, uses SMCLK as source.
diff --git a/boards/OLIMEX_MSP430_P1611/board.h b/boards/OLIMEX_MSP430_P1611/board.h index 34d625994..c445c5b6e 100644 --- a/boards/OLIMEX_MSP430_P1611/board.h +++ b/boards/OLIMEX_MSP430_P1611/board.h @@ -70,12 +70,14 @@ #define VAL_P6OUT P6_O_LED_MASK
#define VAL_P6DIR ~P6_I_BUTTON_MASK
+#if !defined(_FROM_ASM_)
#ifdef __cplusplus
extern "C" {
#endif
- void hwinit(void);
+ void boardInit(void);
#ifdef __cplusplus
}
#endif
+#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */
|