Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-19 21:11:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel/arm: Prevent a uart dereference.

Browse Source 
* Make some wild qemu virt uart assumptions as a fallback

Change-Id: If8ff74b6a6f53b6c38515a9bdd5fba2573f21700
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3541
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Alexander von Gluck IV 2020-12-20 19:11:20 -06:00 committed by Alex von Gluck IV
parent 31fd7ccc19
commit acd5d4fddf
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/kernel/arch/arm/arch_debug_console.cpp
View File

@ -13,6 +13,7 @@
//#include <arch_platform.h>
#include <arch/debug_console.h>
#include <arch/generic/debug_uart.h>
#include <arch/arm/arch_uart_pl011.h>
#include <boot/kernel_args.h>
#include <kernel.h>
#include <vm/vm.h>
@ -62,6 +63,9 @@ arch_debug_serial_try_getchar(void)
char
arch_debug_serial_getchar(void)
{
if (gArchDebugUART == NULL)
return NULL;
return gArchDebugUART->GetChar(false);
}
@ -69,6 +73,9 @@ arch_debug_serial_getchar(void)
void
arch_debug_serial_putchar(const char c)
{
if (gArchDebugUART == NULL)
return;
gArchDebugUART->PutChar(c);
}
@ -95,12 +102,14 @@ status_t
arch_debug_console_init(kernel_args *args)
{
// first try with hints from the FDT
// TODO: Use UEFI somehow
// TODO: Use UEFI somehow to get fdt
//gArchDebugUART = debug_uart_from_fdt(args->platform_args.fdt);
// Do we can some kind of direct fallback here
// (aka, guess arch_get_uart_pl011 or arch_get_uart_8250?)
// As a last try, lets assume qemu's pl011 at a sane address
if (gArchDebugUART == NULL)
gArchDebugUART = arch_get_uart_pl011(0x9000000, 0x16e3600);
// Oh well.
if (gArchDebugUART == NULL)
return B_ERROR;