diff options
Diffstat (limited to 'dev/Kernel/src')
| -rw-r--r-- | dev/Kernel/src/KernelMain.cc | 7 | ||||
| -rw-r--r-- | dev/Kernel/src/Stop.cc | 32 | ||||
| -rw-r--r-- | dev/Kernel/src/UserProcessScheduler.cc | 11 |
3 files changed, 23 insertions, 27 deletions
diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc index 556ab5e2..cc889619 100644 --- a/dev/Kernel/src/KernelMain.cc +++ b/dev/Kernel/src/KernelMain.cc @@ -22,13 +22,9 @@ #include <NewKit/Utils.h> #include <KernelKit/CodeMgr.h> #include <CFKit/Property.h> -#include <Modules/FB/KWindow.h> +#include <Modules/FB/AppearanceMgr.h> #include <KernelKit/Timer.h> -#define kKeCachedName "/System/CacheKernel" - -STATIC CG::ML_WINDOW_STRUCT* kKernelWnd = nullptr; - namespace Kernel::Detail { /// @brief Filesystem auto formatter, additional checks are also done by the class. @@ -129,6 +125,5 @@ namespace Kernel::Detail EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len) { Kernel::Detail::fs_init_newfs(); - Kernel::Detail::NeFilesystemInstaller installer{}; } diff --git a/dev/Kernel/src/Stop.cc b/dev/Kernel/src/Stop.cc index b8bfdb1b..a8974849 100644 --- a/dev/Kernel/src/Stop.cc +++ b/dev/Kernel/src/Stop.cc @@ -35,9 +35,9 @@ namespace Kernel auto x = 10; if (id != RUNTIME_CHECK_BOOTSTRAP) - CGDrawString("Kernel Panic!", start_y, x, panic_text); + fb_render_string("Kernel Panic!", start_y, x, panic_text); else - CGDrawString("Kernel Bootstrap:", start_y, x, panic_text); + fb_render_string("Kernel Bootstrap:", start_y, x, panic_text); start_y += 10; @@ -48,59 +48,59 @@ namespace Kernel switch (id) { case RUNTIME_CHECK_PROCESS: { - CGDrawString("0x00000008: Invalid process behavior.", start_y, x, panic_text); + fb_render_string("0x00000008: Invalid process behavior.", start_y, x, panic_text); break; } case RUNTIME_CHECK_ACPI: { - CGDrawString("0x00000006: ACPI configuration error.", start_y, x, panic_text); + fb_render_string("0x00000006: ACPI configuration error.", start_y, x, panic_text); break; } case RUNTIME_CHECK_PAGE: { - CGDrawString("0x0000000B: Write/Read in non paged area.", start_y, x, panic_text); + fb_render_string("0x0000000B: Write/Read in non paged area.", start_y, x, panic_text); break; } case RUNTIME_CHECK_FILESYSTEM: { - CGDrawString("0x0000000A: Filesystem driver error.", start_y, x, panic_text); + fb_render_string("0x0000000A: Filesystem driver error.", start_y, x, panic_text); break; } case RUNTIME_CHECK_POINTER: { - CGDrawString("0x00000000: Kernel heap is corrupted.", start_y, x, panic_text); + fb_render_string("0x00000000: Kernel heap is corrupted.", start_y, x, panic_text); break; } case RUNTIME_CHECK_BAD_BEHAVIOR: { - CGDrawString("0x00000009: Bad behavior.", start_y, x, panic_text); + fb_render_string("0x00000009: Bad behavior.", start_y, x, panic_text); break; } case RUNTIME_CHECK_BOOTSTRAP: { - CGDrawString("0x0000000A: Kernel has finished running, running OSLdr...", start_y, x, panic_text); + fb_render_string("0x0000000A: Kernel has finished running, running OSLdr...", start_y, x, panic_text); return; } case RUNTIME_CHECK_HANDSHAKE: { - CGDrawString("0x00000005: Handshake fault.", start_y, x, panic_text); + fb_render_string("0x00000005: Handshake fault.", start_y, x, panic_text); break; } case RUNTIME_CHECK_IPC: { - CGDrawString("0x00000003: Bad LPC message.", start_y, x, panic_text); + fb_render_string("0x00000003: Bad LPC message.", start_y, x, panic_text); break; } case RUNTIME_CHECK_INVALID_PRIVILEGE: { - CGDrawString("0x00000007: Privilege access violation.", start_y, x, panic_text); + fb_render_string("0x00000007: Privilege access violation.", start_y, x, panic_text); break; case RUNTIME_CHECK_UNEXCPECTED: { - CGDrawString("0x0000000B: Unexpected violation.", start_y, x, panic_text); + fb_render_string("0x0000000B: Unexpected violation.", start_y, x, panic_text); break; } case RUNTIME_CHECK_VIRTUAL_OUT_OF_MEM: { - CGDrawString("0x10000001: Out of virtual memory.", start_y, x, panic_text); + fb_render_string("0x10000001: Out of virtual memory.", start_y, x, panic_text); break; } case RUNTIME_CHECK_FAILED: { - CGDrawString("0x10000001: Kernel Bug check appears to have failed, a dump has been written to the storage.", start_y, x, panic_text); + fb_render_string("0x10000001: Kernel Bug check appears to have failed, a dump has been written to the storage.", start_y, x, panic_text); break; } default: { - CGDrawString("0xFFFFFFFC: Unknown Kernel Error code.", start_y, x, panic_text); + fb_render_string("0xFFFFFFFC: Unknown Kernel Error code.", start_y, x, panic_text); break; } } diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc index b1bc7735..512b0c22 100644 --- a/dev/Kernel/src/UserProcessScheduler.cc +++ b/dev/Kernel/src/UserProcessScheduler.cc @@ -90,7 +90,8 @@ namespace Kernel } /***********************************************************************************/ - /// @brief Wake process-> + /// @brief Wakes process header. + /// @param should_wakeup if the program shall wakeup or not. /***********************************************************************************/ Void UserProcess::Wake(const bool should_wakeup) @@ -118,7 +119,7 @@ namespace Kernel if (!this->ProcessMemoryHeap) { - this->ProcessMemoryHeap = new UserProcess::UserProcessHeapList(); + this->ProcessMemoryHeap = new UserProcess::ProcessMemoryHeapList(); this->ProcessMemoryHeap->MemoryEntryPad = pad_amount; this->ProcessMemoryHeap->MemoryEntrySize = sz; @@ -132,8 +133,8 @@ namespace Kernel } else { - UserProcessHeapList* entry = this->ProcessMemoryHeap; - UserProcessHeapList* prev_entry = nullptr; + ProcessMemoryHeapList* entry = this->ProcessMemoryHeap; + ProcessMemoryHeapList* prev_entry = nullptr; while (!entry) { @@ -144,7 +145,7 @@ namespace Kernel entry = entry->MemoryNext; } - entry->MemoryNext = new UserProcessHeapList(); + entry->MemoryNext = new ProcessMemoryHeapList(); entry->MemoryNext->MemoryEntry = ptr; entry->MemoryNext->MemoryPrev = entry; |