diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-11-14 13:35:41 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-11-14 13:35:41 +0100 |
| commit | 6055ef45a39b62bffa5f4c194e5d62a177c3b9df (patch) | |
| tree | 69125ae1ffd15b4991cd4b7901b44e6a05d26959 /Source/Kernel/Core | |
| parent | 4d5c1fcf9b1616db662a5cab0cec5ac878ce5175 (diff) | |
| download | Melon-6055ef45a39b62bffa5f4c194e5d62a177c3b9df.tar.gz Melon-6055ef45a39b62bffa5f4c194e5d62a177c3b9df.zip | |
Added screenshots and a grub entry for the GOL simulator.
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 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index 5d4a1ab..1b59f7f 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -147,7 +147,7 @@ void halt() { SimpleVT vt(3, message.size() + 16, 7, 6); vt.map(); vt << "\n\t" << message; - while (1) asm volatile("cli"); + while (1) asm volatile("cli; hlt"); } u32int scall(u8int wat, u32int a, u32int b, u32int c, u32int d) { diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index d812c9a..b6543ae 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -175,10 +175,10 @@ void kmain(multiboot_info_t* mbd, u32int magic) { //*************************************** DEVICE SETUP - if (enableVESA) Dev::registerDevice(new VESADisplay()); - FloppyController::detect(); Dev::registerDevice(new PS2Keyboard()); //Initialize keyboard driver Kbd::setFocus(kvt); //Set focus to virtual terminal + if (enableVESA) Dev::registerDevice(new VESADisplay()); + FloppyController::detect(); //*************************************** MOUNT ROOT FILESYSTEM |