diff options
Diffstat (limited to 'dev/zka/src')
| -rw-r--r-- | dev/zka/src/FS/NeFS.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/IPEFDLLObject.cxx | 36 | ||||
| -rw-r--r-- | dev/zka/src/LPC.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/LockDelegate.cxx | 4 | ||||
| -rw-r--r-- | dev/zka/src/PEFCodeMgr.cxx | 2 | ||||
| -rw-r--r-- | dev/zka/src/Stop.cxx (renamed from dev/zka/src/KernelCheck.cxx) | 15 | ||||
| -rw-r--r-- | dev/zka/src/User.cxx | 4 |
7 files changed, 29 insertions, 36 deletions
diff --git a/dev/zka/src/FS/NeFS.cxx b/dev/zka/src/FS/NeFS.cxx index 69b0c401..61a18ae2 100644 --- a/dev/zka/src/FS/NeFS.cxx +++ b/dev/zka/src/FS/NeFS.cxx @@ -12,7 +12,7 @@ #include <FSKit/NeFS.hxx> #include <KernelKit/LPC.hxx> #include <NewKit/Crc32.hxx> -#include <NewKit/KernelCheck.hxx> +#include <NewKit/Stop.hxx> #include <NewKit/String.hxx> #include <NewKit/Utils.hxx> #include <FirmwareKit/EPM.hxx> diff --git a/dev/zka/src/IPEFDLLObject.cxx b/dev/zka/src/IPEFDLLObject.cxx index a8505eb3..22645dde 100644 --- a/dev/zka/src/IPEFDLLObject.cxx +++ b/dev/zka/src/IPEFDLLObject.cxx @@ -18,7 +18,7 @@ Revision History: - 01/02/24: Rework shared sharedObj ABI, except a rtl_init_dll and + 01/02/24: Rework shared dll_obj ABI, except a rtl_init_dll and rtl_fini_dll (amlel) 15/02/24: Breaking changes, changed the name of the routines. (amlel) @@ -39,62 +39,62 @@ using namespace Kernel; EXTERN_C IDLL rtl_init_dll(UserProcess* header) { - IDLL sharedObj = tls_new_class<IPEFDLLObject>(); + IDLL dll_obj = tls_new_class<IPEFDLLObject>(); - if (!sharedObj) + if (!dll_obj) { header->Crash(); return nullptr; } - sharedObj->Mount(tls_new_class<IPEFDLLObject::DLL_TRAITS>()); + dll_obj->Mount(tls_new_class<IPEFDLLObject::DLL_TRAITS>()); - if (!sharedObj->Get()) + if (!dll_obj->Get()) { header->Crash(); return nullptr; } - sharedObj->Get()->fImageObject = + dll_obj->Get()->fImageObject = header->Image; - if (!sharedObj->Get()->fImageObject) + if (!dll_obj->Get()->fImageObject) { header->Crash(); return nullptr; } - sharedObj->Get()->fImageEntrypointOffset = - sharedObj->Load<VoidPtr>(kPefStart, rt_string_len(kPefStart, 0), kPefCode); + dll_obj->Get()->fImageEntrypointOffset = + dll_obj->Load<VoidPtr>(kPefStart, rt_string_len(kPefStart, 0), kPefCode); - return sharedObj; + return dll_obj; } /***********************************************************************************/ -/** @brief Frees the sharedObj. */ -/** @note Please check if the lib got freed! */ -/** @param lib The sharedObj to free. */ +/** @brief Frees the dll_obj. */ +/** @note Please check if the dll_obj got freed! */ +/** @param dll_obj The dll_obj to free. */ /** @param successful Reports if successful or not. */ /***********************************************************************************/ -EXTERN_C Void rtl_fini_dll(UserProcess* header, IDLL lib, Bool* successful) +EXTERN_C Void rtl_fini_dll(UserProcess* header, IDLL dll_obj, Bool* successful) { MUST_PASS(successful); // sanity check (will also trigger a bug check if this fails) - if (lib == nullptr) + if (dll_obj == nullptr) { *successful = false; header->Crash(); } - delete lib->Get(); - delete lib; + delete dll_obj->Get(); + delete dll_obj; - lib = nullptr; + dll_obj = nullptr; *successful = true; } diff --git a/dev/zka/src/LPC.cxx b/dev/zka/src/LPC.cxx index 46f621bb..46814bbd 100644 --- a/dev/zka/src/LPC.cxx +++ b/dev/zka/src/LPC.cxx @@ -5,7 +5,7 @@ ------------------------------------------- */ #include <KernelKit/LPC.hxx> -#include <NewKit/KernelCheck.hxx> +#include <NewKit/Stop.hxx> namespace Kernel { diff --git a/dev/zka/src/LockDelegate.cxx b/dev/zka/src/LockDelegate.cxx index f23c46d3..74b819b0 100644 --- a/dev/zka/src/LockDelegate.cxx +++ b/dev/zka/src/LockDelegate.cxx @@ -8,5 +8,5 @@ namespace Kernel { - /// Leave it empty for now. -} // namespace Kernel
\ No newline at end of file + /// @note Leave it empty for now. +} // namespace Kernel diff --git a/dev/zka/src/PEFCodeMgr.cxx b/dev/zka/src/PEFCodeMgr.cxx index 80bd9206..b1690abf 100644 --- a/dev/zka/src/PEFCodeMgr.cxx +++ b/dev/zka/src/PEFCodeMgr.cxx @@ -9,7 +9,7 @@ #include <KernelKit/PEFCodeMgr.hxx> #include <KernelKit/UserProcessScheduler.hxx> #include <NewKit/Defines.hxx> -#include <NewKit/KernelCheck.hxx> +#include <NewKit/Stop.hxx> #include <NewKit/OwnPtr.hxx> #include <NewKit/String.hxx> diff --git a/dev/zka/src/KernelCheck.cxx b/dev/zka/src/Stop.cxx index 49ca5edf..9fdc982a 100644 --- a/dev/zka/src/KernelCheck.cxx +++ b/dev/zka/src/Stop.cxx @@ -4,22 +4,17 @@ ------------------------------------------- */ +#include <NewKit/Stop.hxx> + #include <ArchKit/ArchKit.hxx> #include <KernelKit/Timer.hxx> #include <KernelKit/DebugOutput.hxx> -#include <NewKit/KernelCheck.hxx> #include <NewKit/String.hxx> #include <FirmwareKit/Handover.hxx> #include <Modules/ACPI/ACPIFactoryInterface.hxx> #include <KernelKit/FileMgr.hxx> -#include <Modules/CoreCG/Accessibility.hxx> -#include <Modules/CoreCG/FB.hxx> -#include <Modules/CoreCG/Text.hxx> -#include <Modules/CoreCG/Desktop.hxx> - -#define SetMem(dst, byte, sz) Kernel::rt_set_memory((Kernel::VoidPtr)dst, byte, sz) -#define CopyMem(dst, src, sz) Kernel::rt_copy_memory((Kernel::VoidPtr)src, (Kernel::VoidPtr)dst, sz) -#define MoveMem(dst, src, sz) Kernel::rt_copy_memory((Kernel::VoidPtr)src, (Kernel::VoidPtr)dst, sz) +#include <Modules/FB/FB.hxx> +#include <Modules/FB/Text.hxx> #define cWebsiteMacro "https://help.el-mahrouss-logic.com/" @@ -34,8 +29,6 @@ namespace Kernel auto panicTxt = RGB(0xff, 0xff, 0xff); - CG::CGFillBackground(); - auto start_y = 10; auto x = 10; diff --git a/dev/zka/src/User.cxx b/dev/zka/src/User.cxx index 066a3e06..1e4f9df9 100644 --- a/dev/zka/src/User.cxx +++ b/dev/zka/src/User.cxx @@ -10,9 +10,9 @@ * ======================================================== */ -#include <KernelKit/LPC.hxx> #include <KernelKit/User.hxx> -#include <NewKit/KernelCheck.hxx> +#include <KernelKit/LPC.hxx> +#include <NewKit/Stop.hxx> #include <KernelKit/FileMgr.hxx> #include <KernelKit/UserProcessScheduler.hxx> |