From b674183e15d516db00d82b43b4dd6d2ced93eeee Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Thu, 19 Dec 2013 12:22:07 +0100
Subject: [PATCH 1/2] move display and lcd init from autoinit to chronos

---
 boards/chronos/board_init.c |  6 ++++++
 sys/auto_init/auto_init.c   | 10 ----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/boards/chronos/board_init.c b/boards/chronos/board_init.c
index c762e2e9d..ab94cf202 100644
--- a/boards/chronos/board_init.c
+++ b/boards/chronos/board_init.c
@@ -3,6 +3,9 @@
 #include "cpu.h"
 #include "irq.h"
 
+#include "display.h"
+#include "display_putchar.h"
+
 void cc430_cpu_init(void)
 {
     volatile uint16_t i;
@@ -73,4 +76,7 @@ void cc430_cpu_init(void)
 void board_init(void)
 {
     cc430_cpu_init();
+    lcd_init();
+    init_display_putchar();
+    DEBUG("DISP OK");
 }
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 4c11908f8..db4f0f4fb 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -42,16 +42,6 @@ extern int main(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
     DEBUG("Auto init hwtimer module.\n");
     hwtimer_init();

From 680f778fc49f2465410cb3f5201fb166d96b3764 Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Thu, 19 Dec 2013 12:21:34 +0100
Subject: [PATCH 2/2] chronos cleanup

---
 boards/chronos/board_init.c              | 2 ++
 boards/chronos/drivers/battery.c         | 1 +
 boards/chronos/drivers/buzzer.c          | 1 +
 boards/chronos/drivers/display.c         | 1 +
 boards/chronos/drivers/display1.c        | 1 +
 boards/chronos/drivers/display_putchar.c | 3 ++-
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/boards/chronos/board_init.c b/boards/chronos/board_init.c
index ab94cf202..b3c189f7f 100644
--- a/boards/chronos/board_init.c
+++ b/boards/chronos/board_init.c
@@ -1,7 +1,9 @@
 #include <stdint.h>
+
 #include "board.h"
 #include "cpu.h"
 #include "irq.h"
+#include "debug.h"
 
 #include "display.h"
 #include "display_putchar.h"
diff --git a/boards/chronos/drivers/battery.c b/boards/chronos/drivers/battery.c
index 30f788d9f..e787f868b 100644
--- a/boards/chronos/drivers/battery.c
+++ b/boards/chronos/drivers/battery.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <cc430f6137.h>
+
 #include "cc430-adc.h"
 
 uint32_t battery_get_voltage(void)
diff --git a/boards/chronos/drivers/buzzer.c b/boards/chronos/drivers/buzzer.c
index edde080f4..2cee84e5e 100644
--- a/boards/chronos/drivers/buzzer.c
+++ b/boards/chronos/drivers/buzzer.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
 #include <cc430f6137.h>
+
 #include "buzzer.h"
 #include "hwtimer.h"
 
diff --git a/boards/chronos/drivers/display.c b/boards/chronos/drivers/display.c
index 87705d120..e0691700c 100644
--- a/boards/chronos/drivers/display.c
+++ b/boards/chronos/drivers/display.c
@@ -44,6 +44,7 @@
 
 /* driver */
 #include <cc430f6137.h>
+
 #include "display.h"
 
 
diff --git a/boards/chronos/drivers/display1.c b/boards/chronos/drivers/display1.c
index 1c4ee35b2..6b6a4b622 100644
--- a/boards/chronos/drivers/display1.c
+++ b/boards/chronos/drivers/display1.c
@@ -40,6 +40,7 @@
 /* Include section */
 #include <stdint.h>
 #include <cc430f6137.h>
+
 #include "display.h"
 
 /* ************************************************************************************************* */
diff --git a/boards/chronos/drivers/display_putchar.c b/boards/chronos/drivers/display_putchar.c
index db48d7228..4a57d8e84 100644
--- a/boards/chronos/drivers/display_putchar.c
+++ b/boards/chronos/drivers/display_putchar.c
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
+
 #include "display.h"
 
-extern int toupper(int c);
 extern void (*_putchar)(int c);
 
 static char display_buf[11];