diff options
Diffstat (limited to 'boards')
| -rw-r--r-- | boards/OLIMEX_AVR_CAN/board.c | 9 | ||||
| -rw-r--r-- | boards/OLIMEX_AVR_CAN/board.h | 4 | ||||
| -rw-r--r-- | boards/OLIMEX_AVR_MT_128/board.c | 9 | ||||
| -rw-r--r-- | boards/OLIMEX_AVR_MT_128/board.h | 4 |
4 files changed, 10 insertions, 16 deletions
diff --git a/boards/OLIMEX_AVR_CAN/board.c b/boards/OLIMEX_AVR_CAN/board.c index cf2ced8a5..691dcbe13 100644 --- a/boards/OLIMEX_AVR_CAN/board.c +++ b/boards/OLIMEX_AVR_CAN/board.c @@ -32,9 +32,9 @@ CH_IRQ_HANDLER(TIMER0_COMP_vect) { }
/*
- * Board initialization code.
+ * Board-specific initialization code.
*/
-void hwinit(void) {
+void boardInit(void) {
/*
* I/O ports setup.
@@ -76,9 +76,4 @@ void hwinit(void) { TCNT0 = 0; /* Reset counter. */
TIFR0 = (1 << OCF0A); /* Reset pending. */
TIMSK0 = (1 << OCIE0A); /* IRQ on compare. */
-
- /*
- * HAL initialization.
- */
- halInit();
}
diff --git a/boards/OLIMEX_AVR_CAN/board.h b/boards/OLIMEX_AVR_CAN/board.h index 70df97e66..18a6d9904 100644 --- a/boards/OLIMEX_AVR_CAN/board.h +++ b/boards/OLIMEX_AVR_CAN/board.h @@ -89,12 +89,14 @@ #define PORTE_LED (1 << 4)
#define PORTE_BUTTON (1 << 5)
+#if !defined(_FROM_ASM_)
#ifdef __cplusplus
extern "C" {
#endif
- void hwinit(void);
+ void boardInit(void);
#ifdef __cplusplus
}
#endif
+#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */
diff --git a/boards/OLIMEX_AVR_MT_128/board.c b/boards/OLIMEX_AVR_MT_128/board.c index 9f126c85c..64229808d 100644 --- a/boards/OLIMEX_AVR_MT_128/board.c +++ b/boards/OLIMEX_AVR_MT_128/board.c @@ -32,9 +32,9 @@ CH_IRQ_HANDLER(TIMER0_COMP_vect) { }
/*
- * Board initialization code.
+ * Board-specific initialization code.
*/
-void hwinit(void) {
+void boardInit(void) {
/*
* I/O ports setup.
@@ -76,9 +76,4 @@ void hwinit(void) { TCNT0 = 0; /* Reset counter. */
TIFR = (1 << OCF0); /* Reset pending. */
TIMSK = (1 << OCIE0); /* IRQ on compare. */
-
- /*
- * HAL initialization.
- */
- halInit();
}
diff --git a/boards/OLIMEX_AVR_MT_128/board.h b/boards/OLIMEX_AVR_MT_128/board.h index 16ccdf2db..18dfd60b8 100644 --- a/boards/OLIMEX_AVR_MT_128/board.h +++ b/boards/OLIMEX_AVR_MT_128/board.h @@ -113,12 +113,14 @@ #define PORTE_BUZZ1 (1 << 4)
#define PORTE_BUZZ2 (1 << 5)
+#if !defined(_FROM_ASM_)
#ifdef __cplusplus
extern "C" {
#endif
- void hwinit(void);
+ void boardInit(void);
#ifdef __cplusplus
}
#endif
+#endif /* _FROM_ASM_ */
#endif /* _BOARD_H_ */
|