diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-09 16:29:05 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-09 16:29:05 +0200 |
| commit | b9a988061e8220c5ef2406f5cd2221bf3f1b435d (patch) | |
| tree | 7d523347e555a7555740d7b0ceffbeb35c32d1e6 /Source/Kernel/Core | |
| parent | 92abedffec913fe7337117403c5e07185356c81b (diff) | |
| download | Melon-b9a988061e8220c5ef2406f5cd2221bf3f1b435d.tar.gz Melon-b9a988061e8220c5ef2406f5cd2221bf3f1b435d.zip | |
Exiting from a thread now works without hanging everything.
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 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Kernel/Core/Sys.ns.cpp b/Source/Kernel/Core/Sys.ns.cpp index c3561f2..a54c387 100644 --- a/Source/Kernel/Core/Sys.ns.cpp +++ b/Source/Kernel/Core/Sys.ns.cpp @@ -125,7 +125,7 @@ void halt() { asm volatile("cli"); Log::close(); String message("MELON SEZ : KTHXBYE, U CAN NAOW TURNZ OFF UR COMPUTER."); - SimpleVT vt(3, message.size() + 16, 6, 0); + SimpleVT vt(3, message.size() + 16, 7, 6); vt.map(); vt << "\n\t" << message; while (1) asm volatile("cli"); diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 924cfc2..f1efc70 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -75,8 +75,8 @@ void kmain(multiboot_info_t* mbd, u32int magic) { melonLogoVT->map(1); //Create a VT for logging what kernel does - SimpleVT *kvt = new ScrollableVT(5, 69, 10, KVT_FGCOLOR, KVT_BGCOLOR); - kvt->map(20); + SimpleVT *kvt = new ScrollableVT(3, 69, 10, KVT_FGCOLOR, KVT_BGCOLOR); + kvt->map(22); INFO(kvt); *kvt << "Lower ram : " << (s32int)mbd->mem_lower << "k, upper : " << (s32int)mbd->mem_upper << "k.\n"; INFO(kvt); *kvt << "Placement address : " << (u32int)Mem::placementAddress << "\n"; @@ -131,7 +131,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Log::log(KL_STATUS, "kmain : Kernel shell launched"); while (KernelShell::getInstances() > 0) { - Task::currentThread->sleep(10); + Task::currentThread->sleep(100); } Log::log(KL_STATUS, "kmain : All kernel shells finished. Halting."); |