riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move display and lcd init from autoinit to chronos

Browse Source
This commit is contained in:
Ludwig Ortmann 2013-12-19 12:22:07 +01:00
parent cdb77c2392
commit b674183e15
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/chronos/board_init.c
View File

@ -3,6 +3,9 @@
#include "cpu.h" #include "cpu.h"
#include "irq.h" #include "irq.h"
#include "display.h"
#include "display_putchar.h"
void cc430_cpu_init(void) void cc430_cpu_init(void)
{ {
volatile uint16_t i; volatile uint16_t i;
@ -73,4 +76,7 @@ void cc430_cpu_init(void)
void board_init(void) void board_init(void)
{ {
cc430_cpu_init(); cc430_cpu_init();
lcd_init();
init_display_putchar();
DEBUG("DISP OK");
} }

10
sys/auto_init/auto_init.c
View File

@ -42,16 +42,6 @@ extern int main(void);
void auto_init(void) void auto_init(void)
{ {
#ifdef MODULE_BOARD_DISPLAY
extern void lcd_init();
lcd_init();
DEBUG("DISP OK");
#endif
#ifdef MODULE_DISPLAY_PUTCHAR
extern void init_display_putchar();
init_display_putchar();
DEBUG("DISP OK");
#endif
#ifdef MODULE_HWTIMER #ifdef MODULE_HWTIMER
DEBUG("Auto init hwtimer module.\n"); DEBUG("Auto init hwtimer module.\n");
hwtimer_init(); hwtimer_init();