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/Mod/CoreGfx/AccessibilityMgr.h | 2 +- dev/Mod/CoreGfx/FBMgr.h | 4 ++-- dev/Mod/CoreGfx/MathMgr.h | 2 +- dev/Mod/MFlash/MFlash.h | 4 ++-- dev/Mod/NVME/NVME.h | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'dev/Mod') diff --git a/dev/Mod/CoreGfx/AccessibilityMgr.h b/dev/Mod/CoreGfx/AccessibilityMgr.h index 5d153ac8..6916984b 100644 --- a/dev/Mod/CoreGfx/AccessibilityMgr.h +++ b/dev/Mod/CoreGfx/AccessibilityMgr.h @@ -24,7 +24,7 @@ namespace FB ~UIAccessibilty() = default; public: - ZKA_COPY_DELETE(UIAccessibilty); + NE_COPY_DELETE(UIAccessibilty); static Int64 Width() noexcept { diff --git a/dev/Mod/CoreGfx/FBMgr.h b/dev/Mod/CoreGfx/FBMgr.h index 955855f0..670a0525 100644 --- a/dev/Mod/CoreGfx/FBMgr.h +++ b/dev/Mod/CoreGfx/FBMgr.h @@ -16,7 +16,7 @@ #define fb_clear() kCGCursor = 0 -#ifdef __ZKA_AMD64__ +#ifdef __NE_AMD64__ /// @brief Performs Alpha drawing on the framebuffer. #define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ @@ -127,7 +127,7 @@ #define FBDrawInRegion(_Clr, height, width, base_x, base_y) #define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) #define FBDrawInRegionA(_Clr, height, width, base_x, base_y) -#endif // __ZKA_AMD64__ +#endif // __NE_AMD64__ #ifndef GFX_MGR_ACCESSIBILITY_H #include diff --git a/dev/Mod/CoreGfx/MathMgr.h b/dev/Mod/CoreGfx/MathMgr.h index 87f674df..7e85c0dc 100644 --- a/dev/Mod/CoreGfx/MathMgr.h +++ b/dev/Mod/CoreGfx/MathMgr.h @@ -11,7 +11,7 @@ namespace UI { -#ifdef ZKA_GFX_MGR_USE_DOUBLE +#ifdef NE_GFX_MGR_USE_DOUBLE typedef double fb_real_t; #else typedef float fb_real_t; diff --git a/dev/Mod/MFlash/MFlash.h b/dev/Mod/MFlash/MFlash.h index 05cfb2c8..026c6102 100644 --- a/dev/Mod/MFlash/MFlash.h +++ b/dev/Mod/MFlash/MFlash.h @@ -6,7 +6,7 @@ #pragma once -#ifdef ZKA_USE_MBCI_FLASH +#ifdef NE_USE_MBCI_FLASH #include @@ -18,4 +18,4 @@ Kernel::Void drv_enable_at(Kernel::Int32 slot); Kernel::Void drv_disable_at(Kernel::Int32 slot); -#endif // ifdef ZKA_USE_MBCI_FLASH +#endif // ifdef NE_USE_MBCI_FLASH diff --git a/dev/Mod/NVME/NVME.h b/dev/Mod/NVME/NVME.h index e42a609b..2fb098a0 100644 --- a/dev/Mod/NVME/NVME.h +++ b/dev/Mod/NVME/NVME.h @@ -5,7 +5,7 @@ Revision History: ??/??/24: Added file (amlel) - 23 Jul 24: Update filename to Defines.h and using ZKA_ALIGN_NVME for NVME structs. (amlel) + 23 Jul 24: Update filename to Defines.h and using NE_ALIGN_NVME for NVME structs. (amlel) ------------------------------------------- */ @@ -17,11 +17,11 @@ /// @file NVME.h /// @brief NVME driver. -#define ZKA_ALIGN_NVME ATTRIBUTE(aligned(sizeof(Kernel::UInt32))) +#define NE_ALIGN_NVME ATTRIBUTE(aligned(sizeof(Kernel::UInt32))) namespace Kernel { - struct ZKA_ALIGN_NVME HAL_NVME_BAR_0 final + struct NE_ALIGN_NVME HAL_NVME_BAR_0 final { UInt32 fCapabilities; UInt32 fVersion; @@ -34,7 +34,7 @@ namespace Kernel UInt32 fAdminCompletionQueue; }; - struct ZKA_ALIGN_NVME HAL_NVME_QUEUE final + struct NE_ALIGN_NVME HAL_NVME_QUEUE final { UInt32 fOpcode; UInt32 fNSID; -- cgit v1.2.3