summaryrefslogtreecommitdiff
path: root/arch/x86/machine/boot.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2017-05-28 17:31:04 +0200
committerRichard Braun <rbraun@sceen.net>2017-05-28 17:57:29 +0200
commit001ea7c0bbe1b5fb440b5e628faa47d8a58f36b7 (patch)
tree87b81ba25422dab4372696ec1821ab2ee179774b /arch/x86/machine/boot.c
parent5a711e07fe97d3fdbd6e322bacd41de44bdf82d3 (diff)
x86: new atcons and atkbd modules
These modules, together with cga, implement the AT console driver.
Diffstat (limited to 'arch/x86/machine/boot.c')
-rw-r--r--arch/x86/machine/boot.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c
index 0df96747..b7a9b0ee 100644
--- a/arch/x86/machine/boot.c
+++ b/arch/x86/machine/boot.c
@@ -63,6 +63,7 @@
#include <kern/syscnt.h>
#include <kern/thread.h>
#include <kern/turnstile.h>
+#include <machine/atcons.h>
#include <machine/biosmem.h>
#include <machine/boot.h>
#include <machine/cga.h>
@@ -468,7 +469,7 @@ boot_main(void)
cpu_setup();
thread_bootstrap();
console_setup();
- cga_setup();
+ atcons_bootstrap();
uart_bootstrap();
printf_setup();
boot_show_version();
@@ -485,6 +486,7 @@ boot_main(void)
intr_setup();
cpu_mp_probe();
pic_setup();
+ atcons_setup();
uart_setup();
kernel_main();