diff options
| author | Benji Dial <benji6283@gmail.com> | 2020-09-13 03:19:57 -0400 |
|---|---|---|
| committer | Benji Dial <benji6283@gmail.com> | 2020-09-13 03:19:57 -0400 |
| commit | 1e4a254674f668839e5de273916024c16814b045 (patch) | |
| tree | 6774f4d4398a29c4aafb4120070975d864ffcde4 /src/kernel/main.c | |
| parent | b8284137d4e0eec11c78bc14047243fce6a51373 (diff) | |
| download | portland-os-1e4a254674f668839e5de273916024c16814b045.tar.gz | |
(basic, not much tested) keyboard, better panic
Diffstat (limited to 'src/kernel/main.c')
| -rw-r--r-- | src/kernel/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c index d99b595..e2a23e8 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -13,6 +13,7 @@ #include "elf.h" #include "log.h" #include "vga.h" +#include "kbd.h" void reset_tree(); void tree(struct drive *d); @@ -32,8 +33,6 @@ void main() { logsz("Portland v0.0.11\n\n"); - //list vesa modes? - pci_init(); u16_dec(n_pci_devices, nbuf); @@ -137,9 +136,10 @@ void main() { logsz(nbuf); logsz("k\n\n"); - if (!try_elf_run(drives, "BIN/INIT.ELF")) - panic("Failed to load init program."); + if (!try_elf_run(drives, "BIN/INIT.ELF", "")) + PANIC("Failed to load init program."); + init_kbd(); init_idt(); logsz("Switching to init task.\n"); |