diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-09-20 15:17:37 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-09-20 15:17:37 +0200 |
| commit | e7fad609d7d7694ebd19212623a0334bd949c741 (patch) | |
| tree | 1c99ff84bc3e7a951a448ad2fc423e640e710545 /Source/Kernel/Core | |
| parent | 9bdc18da391979479ad5c677770c3e8dffa1cb9a (diff) | |
| download | Melon-e7fad609d7d7694ebd19212623a0334bd949c741.tar.gz Melon-e7fad609d7d7694ebd19212623a0334bd949c741.zip | |
Added some screenshots :)
Diffstat (limited to 'Source/Kernel/Core')
| -rw-r--r-- | Source/Kernel/Core/Sys.ns.cpp | 2 | ||||
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index 081e7a5..c3561f2 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -124,7 +124,7 @@ void reboot() { void halt() { asm volatile("cli"); Log::close(); - String message("MELON SEZ : KTHXBYE, IOU CAN NAOW TURNZ OFF UR COMPUTER."); + String message("MELON SEZ : KTHXBYE, U CAN NAOW TURNZ OFF UR COMPUTER."); SimpleVT vt(3, message.size() + 16, 6, 0); vt.map(); vt << "\n\t" << message; diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 6862e18..366b6b9 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -115,7 +115,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Log::log(KL_STATUS, "kmain : Registered textual VGA output"); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver - Kbd::loadKeymap("fr"); + if (!Kbd::loadKeymap("fr")) Log::log(KL_ERROR, "kmain : could not load french keymap."); Kbd::setFocus(kvt); //Set focus to virtual terminal Log::log(KL_STATUS, "kmain : Keyboard set up"); |