DeforaOS/uKernel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the UART console to be loaded

Browse Source
This commit is contained in:
Pierre Pronchery 2018-06-07 09:34:04 -04:00
parent a256aa9a66
commit ffdf050544
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/console.c
View File

@ -17,6 +17,7 @@ static ukConsole * _console = NULL;
/* functions */ /* functions */
#if defined(__amd64__) || defined(__i386__) #if defined(__amd64__) || defined(__i386__)
extern ukConsole uart_console;
extern ukConsole vesa_console; extern ukConsole vesa_console;
extern ukConsole vga_console; extern ukConsole vga_console;
@ -27,7 +28,9 @@ ukConsole * console_init(ukBus * bus, char const * name)
if(_console != NULL) if(_console != NULL)
return _console; return _console;
if(strcmp(name, "vesa") == 0) if(strcmp(name, "uart") == 0)
console = &uart_console;
else if(strcmp(name, "vesa") == 0)
console = &vesa_console; console = &vesa_console;
else if(strcmp(name, "vga") == 0) else if(strcmp(name, "vga") == 0)
console = &vga_console; console = &vga_console;

2
src/loader/project.conf
View File

@ -26,7 +26,7 @@ sources=../common/crtn.S
[libuLoader] [libuLoader]
type=library type=library
sources=console/vesa.c,console/vga.c,lib.c sources=console/uart.c,console/vesa.c,console/vga.c,lib.c
[uLoader.bin] [uLoader.bin]
type=binary type=binary