From d0c7a3e05a1bb5c9cffd1a0946e403d3a8e37e63 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 31 Jan 2025 19:05:36 +0100 Subject: Match the changes in OpenNE, (without reusing it) Signed-off-by: Amlal El Mahrouss --- dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc | 10 +++++----- dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc | 4 ++-- dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dev/Kernel/HALKit/ARM64') diff --git a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc index 0991fd37..d3c4f985 100644 --- a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc @@ -15,7 +15,7 @@ namespace Kernel::HAL typedef UInt32 PageTableIndex; /// \brief Page store type. - struct ZKA_PAGE_STORE final + struct NE_PAGE_STORE final { struct { @@ -26,9 +26,9 @@ namespace Kernel::HAL Bool fStoreOp{No}; // Store operation in progress. - static ZKA_PAGE_STORE& The() + static NE_PAGE_STORE& The() { - static ZKA_PAGE_STORE the; + static NE_PAGE_STORE the; return the; } }; @@ -51,7 +51,7 @@ namespace Kernel::HAL !flags) return 0; - ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The(); + NE_PAGE_STORE& page_store = NE_PAGE_STORE::The(); while (page_store.fStoreOp) ; @@ -71,7 +71,7 @@ namespace Kernel::HAL /// @internal Internal function. STATIC Int32 mmi_map_page_table_entry(VoidPtr virtual_address, UInt32 flags, PTE* pt_entry) { - ZKA_PAGE_STORE& page_store = ZKA_PAGE_STORE::The(); + NE_PAGE_STORE& page_store = NE_PAGE_STORE::The(); // Update Internal store. diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc index ff1dd448..87a6123a 100644 --- a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc @@ -12,13 +12,13 @@ namespace Kernel /// Wakes up thread from the hang state. Void mp_wakeup_thread(HAL::StackFrame* stack) { - ZKA_UNUSED(stack); + NE_UNUSED(stack); } /// @brief makes the thread sleep on a loop. /// hooks and hangs thread to prevent code from executing. Void mp_hang_thread(HAL::StackFrame* stack) { - ZKA_UNUSED(stack); + NE_UNUSED(stack); } } // namespace Kernel diff --git a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc index 6b4d7ab4..30e7cef0 100644 --- a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc +++ b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#ifdef ZKA_USE_MBCI_FLASH +#ifdef NE_USE_MBCI_FLASH #include #include @@ -81,4 +81,4 @@ namespace Kernel } } // namespace Kernel -#endif // if ZKA_USE_MBCI_FLASH +#endif // if NE_USE_MBCI_FLASH -- cgit v1.2.3