diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-20 13:40:58 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-20 13:40:58 +0100 |
| commit | 247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b (patch) | |
| tree | 9fd02cb4ade964a9915aa232d0f9f64388e67a6a | |
| parent | 07f030f2a2147598236c5fd361a7caaba7d00b23 (diff) | |
| download | Melon-247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b.tar.gz Melon-247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b.zip | |
Keyboard warning gets logged
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -6,3 +6,7 @@ Source/Kernel/Map.txt Source/Kernel/Melon.ke Ports Ports/* +Cross +Cross/* +Unix +Unix/* diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index ad11eaf..5181cb7 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -214,13 +214,13 @@ void kmain(multiboot_info_t* mbd, u32int magic) { //*************************************** LOAD SYSTEM STUFF - if (keymap != "builtin") { - if (!Kbd::loadKeymap(keymap)) *kvt << "WARNING : Could not load keymap " << keymap << ", using built-in keymap instead."; - } - Log::init(KL_STATUS); //Setup logging Log::log(KL_STATUS, "kmain : Melon booting."); + if (keymap != "builtin") { + if (!Kbd::loadKeymap(keymap)) Log::log(KL_WARNING, String("WARNING : Could not load keymap ") += keymap += ", using built-in keymap instead."); + } + Usr::load(); //Setup user managment Log::log(KL_STATUS, "kmain : User list loaded"); |