From cd4265c803e1aef3ee9ba306f43ef9e4f40cbff0 Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Mon, 18 Oct 2010 01:15:13 +0000 Subject: [PATCH] * For ARM, we now always read from the serial for KDL input. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38994 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/arch/arm/arch_debug_console.cpp | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/system/kernel/arch/arm/arch_debug_console.cpp b/src/system/kernel/arch/arm/arch_debug_console.cpp index 8f5d6fbc63..dee7b98a49 100644 --- a/src/system/kernel/arch/arm/arch_debug_console.cpp +++ b/src/system/kernel/arch/arm/arch_debug_console.cpp @@ -34,32 +34,21 @@ arch_debug_install_interrupt_handlers(void) char arch_debug_blue_screen_getchar(void) { -#warning ARM WRITEME - return 0; -//M68KPlatform::Default()->BlueScreenGetChar(); + return arch_debug_serial_getchar(); } char arch_debug_serial_getchar(void) { -#warning ARM WRITEME -return uart_getc(0,FALSE); -// return 0; -//M68KPlatform::Default()->SerialDebugGetChar(); + return uart_getc(uart_debug_port(), FALSE); } void arch_debug_serial_putchar(const char c) { -//uart_putc(0,c); -//uart_putc(1,c); -uart_putc(0,c); -#warning ARM WRITEME - -// return 0; -//M68KPlatform::Default()->SerialDebugPutChar(c); + uart_putc(uart_debug_port(), c); } @@ -77,22 +66,16 @@ void arch_debug_serial_early_boot_message(const char *string) { // this function will only be called in fatal situations + arch_debug_serial_puts(string); } status_t arch_debug_console_init(kernel_args *args) { + uart_init_early(); -uart_init_early(); -uart_init();//todo -uart_init_port(0,9600); -uart_init_port(1,9600); -uart_init_port(2,9600); -#warning ARM WRITEME - - return 0; -//M68KPlatform::Default()->InitSerialDebug(args); + return B_OK; }