From 94bb3c0e7bdca4e5cd85a576a98b0b19847b597c Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 20 Oct 2024 19:18:29 +0200 Subject: FIX: Ran formatter. Signed-off-by: Amlal El Mahrouss --- dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx | 6 +++--- dev/zka/HALKit/AMD64/HalKernelMain.cxx | 24 ++++++++++++------------ dev/zka/src/UserProcessScheduler.cxx | 27 +++++++++++++-------------- 3 files changed, 28 insertions(+), 29 deletions(-) (limited to 'dev') diff --git a/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx b/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx index 343ac9ab..ba893515 100644 --- a/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx +++ b/dev/zka/HALKit/AMD64/HalDescriptorLoader.cxx @@ -100,9 +100,9 @@ namespace Kernel::HAL hal_load_idt(idt); Detail::hal_enable_pit(cPITTickForScheduler); - - rt_sti(); - } + + rt_sti(); + } void GDTLoader::Load(Ref& gdt) { diff --git a/dev/zka/HALKit/AMD64/HalKernelMain.cxx b/dev/zka/HALKit/AMD64/HalKernelMain.cxx index e836a239..17bd99f3 100644 --- a/dev/zka/HALKit/AMD64/HalKernelMain.cxx +++ b/dev/zka/HALKit/AMD64/HalKernelMain.cxx @@ -24,7 +24,7 @@ namespace Kernel { EXTERN UserProcessScheduler* cProcessScheduler; EXTERN HardwareThreadScheduler* cHardwareThreadScheduler; -} +} // namespace Kernel EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; EXTERN_C Kernel::VoidPtr mp_user_switch_proc; @@ -36,7 +36,7 @@ EXTERN_C void hal_init_platform( { kHandoverHeader = HandoverHeader; - Kernel::cProcessScheduler = nullptr; + Kernel::cProcessScheduler = nullptr; Kernel::cHardwareThreadScheduler = nullptr; if (kHandoverHeader->f_Magic != kHandoverMagic && @@ -49,7 +49,7 @@ EXTERN_C void hal_init_platform( /* INITIALIZE BIT MAP. */ /************************************** */ - kKernelBitMpSize = kHandoverHeader->f_BitMapSize; + kKernelBitMpSize = kHandoverHeader->f_BitMapSize; kKernelBitMpStart = reinterpret_cast( reinterpret_cast(kHandoverHeader->f_BitMapStart)); @@ -83,23 +83,23 @@ EXTERN_C void hal_init_platform( EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept { - /* Initialize filesystem. */ + /* Initialize filesystem. */ Kernel::NeFileSystemMgr* mgr = Kernel::mm_new_class(); Kernel::NeFileSystemMgr::Mount(mgr); - - /* Initialize scheduler. */ + + /* Initialize scheduler. */ Kernel::UserProcessHelper::InitializeScheduler(); - /* Start any cores. */ + /* Start any cores. */ if (kHandoverHeader->f_HardwareTables.f_MultiProcessingEnabled) Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - - /* Load System.exe here (TODO) */ - - Kernel::HAL::Register64 idt_reg; + + /* Load System.exe here (TODO) */ + + Kernel::HAL::Register64 idt_reg; idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable; - /* Load interrupts. */ + /* Load interrupts. */ Kernel::HAL::IDTLoader idt_loader; idt_loader.Load(idt_reg); diff --git a/dev/zka/src/UserProcessScheduler.cxx b/dev/zka/src/UserProcessScheduler.cxx index af9ab5d3..7b84f1fb 100644 --- a/dev/zka/src/UserProcessScheduler.cxx +++ b/dev/zka/src/UserProcessScheduler.cxx @@ -41,7 +41,6 @@ namespace Kernel UserProcessScheduler* cProcessScheduler = nullptr; EXTERN HardwareThreadScheduler* cHardwareThreadScheduler; - /// @brief Gets the last exit code. /// @note Not thread-safe. /// @return Int32 the last exit code. @@ -57,14 +56,14 @@ namespace Kernel Void UserProcess::Crash() { if (*this->Name != 0 && - *this->Name > 'A') -{ - kcout << this->Name << ": crashed, error id: " << number(kErrorProcessFault) << endl; -} - else - { - return; - } + *this->Name > 'A') + { + kcout << this->Name << ": crashed, error id: " << number(kErrorProcessFault) << endl; + } + else + { + return; + } this->Exit(kErrorProcessFault); } @@ -516,11 +515,11 @@ namespace Kernel { cProcessScheduler = new UserProcessScheduler(); } - - if (!cHardwareThreadScheduler) - { - cHardwareThreadScheduler = new HardwareThreadScheduler(); - } + + if (!cHardwareThreadScheduler) + { + cHardwareThreadScheduler = new HardwareThreadScheduler(); + } return Yes; } -- cgit v1.2.3