diff options
Diffstat (limited to 'Source/Kernel/Core/kmain.wtf.cpp')
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 9ecc9d7..2324857 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -4,6 +4,7 @@ #include <Core/multiboot.wtf.h> #include <Devices/Display/VGATextOutput.class.h> +#include <Devices/Display/VESADisplay.class.h> #include <Devices/Keyboard/PS2Keyboard.class.h> #include <Devices/Floppy/FloppyDrive.class.h> #include <Devices/Timer.class.h> @@ -91,8 +92,9 @@ void selectVideoMode(SimpleVT& v) { } else { v << "No graphics"; } - v.setCursorCol(40); - v << m.device->getName() << "\n"; + //v.setCursorCol(40); + //v << m.device->getName() << "\n"; + v << "\n"; } while (1) { @@ -161,6 +163,8 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Dev::registerDevice(vgaout); Log::log(KL_STATUS, "kmain : Registered textual VGA output"); + Dev::registerDevice(new VESADisplay()); + Log::log(KL_STATUS, "kmain : Created VESA display"); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver if (!Kbd::loadKeymap("fr")) Log::log(KL_ERROR, "kmain : could not load french keymap."); @@ -183,6 +187,8 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Usr::load(); Log::log(KL_STATUS, "kmain : User list loaded"); + //PANIC("Good, this works !"); + Process* p = Process::run("/System/Applications/PaperWork.app", 0); if (p == 0) { PANIC("Could not launch PaperWork !"); |