diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:39:21 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 10:39:21 +0000 |
| commit | ace3f844709b1bfdd4c88acbc943bdecf29f9f21 (patch) | |
| tree | aeaa2bcbb29d67e60379a06d92e804be566f4bbb /boards/OLIMEX_AVR_CAN | |
| parent | 35c315a77a92d8ca0efefea329770c6bf9adca2d (diff) | |
| download | ChibiOS-ace3f844709b1bfdd4c88acbc943bdecf29f9f21.tar.gz ChibiOS-ace3f844709b1bfdd4c88acbc943bdecf29f9f21.tar.bz2 ChibiOS-ace3f844709b1bfdd4c88acbc943bdecf29f9f21.zip | |
AVR board files and demos updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2501 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'boards/OLIMEX_AVR_CAN')
| -rw-r--r-- | boards/OLIMEX_AVR_CAN/board.c | 9 | ||||
| -rw-r--r-- | boards/OLIMEX_AVR_CAN/board.h | 4 |
2 files changed, 5 insertions, 8 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_ */
|