Match the changes in OpenNE, (without reusing it)

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

20 files changed, 40 insertions, 40 deletions

diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h
index 5a537448..81f0796a 100644
--- a/dev/Boot/BootKit/BootKit.h
+++ b/dev/Boot/BootKit/BootKit.h
@@ -218,7 +218,7 @@ namespace Boot
 
 		~BDiskFormatFactory() = default;
 
-		ZKA_COPY_DELETE(BDiskFormatFactory);
+		NE_COPY_DELETE(BDiskFormatFactory);
 
 		/// @brief Format disk using partition name and blob_list.
 		/// @param Partition part_name the target partition name.
@@ -332,7 +332,7 @@ namespace Boot
 		{
 			fb_init();
 
-			FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
+			FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 			EFI::ThrowError(L"Drive-Too-Tiny", L"Can't format a NeFS partition here.");
 			return false;
 		}
diff --git a/dev/Boot/BootKit/Device.h b/dev/Boot/BootKit/Device.h
index bbb0ce89..753d9d35 100644
--- a/dev/Boot/BootKit/Device.h
+++ b/dev/Boot/BootKit/Device.h
@@ -18,7 +18,7 @@ public:
 	explicit Device() = default;
 	virtual ~Device() = default;
 
-	ZKA_MOVE_DEFAULT(Device);
+	NE_MOVE_DEFAULT(Device);
 
 	struct Trait
 	{
diff --git a/dev/Boot/BootKit/HW/ATA.h b/dev/Boot/BootKit/HW/ATA.h
index c58bbd61..397f96b4 100644
--- a/dev/Boot/BootKit/HW/ATA.h
+++ b/dev/Boot/BootKit/HW/ATA.h
@@ -23,7 +23,7 @@ public:
 	explicit BootDeviceATA() noexcept;
 	~BootDeviceATA() = default;
 
-	ZKA_COPY_DELETE(BootDeviceATA);
+	NE_COPY_DELETE(BootDeviceATA);
 
 	enum
 	{
diff --git a/dev/Boot/BootKit/HW/SATA.h b/dev/Boot/BootKit/HW/SATA.h
index a7ece124..1f1d70a2 100644
--- a/dev/Boot/BootKit/HW/SATA.h
+++ b/dev/Boot/BootKit/HW/SATA.h
@@ -15,7 +15,7 @@ public:
 	explicit BootDeviceSATA() noexcept;
 	~BootDeviceSATA() = default;
 
-	ZKA_COPY_DEFAULT(BootDeviceSATA);
+	NE_COPY_DEFAULT(BootDeviceSATA);
 
 	struct SATATrait final
 	{
diff --git a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
index ce980b7b..61fd48dd 100644
--- a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_DISK_HEIGHT 110

-#define ZKA_DISK_WIDTH 110

+#define NE_DISK_HEIGHT 110

+#define NE_DISK_WIDTH 110

 

 // array size is 36300

 static const unsigned int zka_disk[]  = {

diff --git a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
index bdc0bb99..4ede8a65 100644
--- a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_HAS_DISK_HEIGHT 110

-#define ZKA_HAS_DISK_WIDTH 110

+#define NE_HAS_DISK_HEIGHT 110

+#define NE_HAS_DISK_WIDTH 110

 

 // array size is 36300

 static const unsigned int zka_has_disk[]  = {

diff --git a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
index 31689e63..f89abad0 100644
--- a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
+++ b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc
@@ -1,5 +1,5 @@
-#define ZKA_NO_DISK_HEIGHT 110
-#define ZKA_NO_DISK_WIDTH 110
+#define NE_NO_DISK_HEIGHT 110
+#define NE_NO_DISK_WIDTH 110
 
 // array size is 36300
 static const unsigned int zka_no_disk[]  = {
diff --git a/dev/Boot/Mod/NetBoot/NetBoot.cc b/dev/Boot/Mod/NetBoot/NetBoot.cc
index 18251e69..cd2db5d2 100644
--- a/dev/Boot/Mod/NetBoot/NetBoot.cc
+++ b/dev/Boot/Mod/NetBoot/NetBoot.cc
@@ -12,7 +12,7 @@
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 	return kEfiFail;
 #else
 	return kEfiOk;
diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json
index a19f3cbf..e02f7f13 100644
--- a/dev/Boot/Mod/NetBoot/build.json
+++ b/dev/Boot/Mod/NetBoot/build.json
@@ -16,7 +16,7 @@
   "cpp_macros": [
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
-    "__ZKA_AMD64__",
+    "__NE_AMD64__",
     "kNetBootVersionHighest=0x0100",
     "kNetBootVersionLowest=0x0100",
     "kNetBootVersion=0x0100"
diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S
index b5795450..f825c5a9 100644
--- a/dev/Boot/Mod/SysChk/Boot.S
+++ b/dev/Boot/Mod/SysChk/Boot.S
@@ -7,7 +7,7 @@
 ;; * 	========================================================
 ;; */
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 .code64
 .intel_syntax noprefix
 #endif
diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc
index 0297b177..d655325e 100644
--- a/dev/Boot/Mod/SysChk/Module.cc
+++ b/dev/Boot/Mod/SysChk/Module.cc
@@ -23,7 +23,7 @@
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 	Boot::BDiskFormatFactory<BootDeviceATA> partition_factory;
 
 	if (partition_factory.IsPartitionValid())
diff --git a/dev/Boot/Mod/SysChk/amd64.json b/dev/Boot/Mod/SysChk/amd64.json
index e1e1b818..0fdaec50 100644
--- a/dev/Boot/Mod/SysChk/amd64.json
+++ b/dev/Boot/Mod/SysChk/amd64.json
@@ -17,7 +17,7 @@
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
     "__BOOTLDR_STANDALONE__",
-    "__ZKA_AMD64__",
+    "__NE_AMD64__",
     "kChkVersionHighest=0x0100",
     "kChkVersionLowest=0x0100",
     "kChkVersion=0x0100"
diff --git a/dev/Boot/Mod/SysChk/arm64.json b/dev/Boot/Mod/SysChk/arm64.json
index 0e107e28..59cb6189 100644
--- a/dev/Boot/Mod/SysChk/arm64.json
+++ b/dev/Boot/Mod/SysChk/arm64.json
@@ -18,7 +18,7 @@
     "__NEOSKRNL__",
     "__ZBAOSLDR__",
     "__BOOTLDR_STANDALONE__",
-    "__ZKA_ARM64__",
+    "__NE_ARM64__",
     "kChkVersionHighest=0x0100",
     "kChkVersionLowest=0x0100",
     "kChkVersion=0x0100"
diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make
index 73d5a0cc..a8081b71 100644
--- a/dev/Boot/amd64-desktop.make
+++ b/dev/Boot/amd64-desktop.make
@@ -21,7 +21,7 @@ EMU=qemu-system-x86_64  -net none
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"NeOS\""
+NE_MODEL=-DkMachineModel="\"NeOS\""
 endif
 
 BIOS=OVMF.fd
@@ -44,7 +44,7 @@ REM_FLAG=-f
 FLAG_ASM=-f win64
 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__ZBAOSLDR__ \
 			-DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I../ -c -nostdlib -fno-rtti -fno-exceptions \
-                        -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT
+                        -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_NE_APIS__ -DZBA_USE_FB -D__NE_AMD64__ -D__NE__ -DNE_AUTO_FORMAT
 
 BOOTLOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -75,7 +75,7 @@ endif
 .PHONY: compile-amd64
 compile-amd64:
 	$(WINDRES) src/BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/AMD64/*.cc) \
 	$(wildcard src/HEL/AMD64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/arm64-desktop.make b/dev/Boot/arm64-desktop.make
index 16341b21..d5ac561a 100644
--- a/dev/Boot/arm64-desktop.make
+++ b/dev/Boot/arm64-desktop.make
@@ -19,7 +19,7 @@ EMU=qemu-system-aarch64
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"ZKA\""
+NE_MODEL=-DkMachineModel="\"ZKA\""
 endif
 
 BIOS=OVMF.fd
@@ -43,9 +43,9 @@ REM=rm
 REM_FLAG=-f
 
 FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
+FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DZBA_USE_FB -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
 
 BOOT_LOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -73,7 +73,7 @@ endif
 .PHONY: compile
 compile:
 	$(RESCMD)
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/ARM64/*.cc) \
 	$(wildcard src/HEL/ARM64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/arm64-mobile.make b/dev/Boot/arm64-mobile.make
index 9ca37b89..2b6e0e2b 100644
--- a/dev/Boot/arm64-mobile.make
+++ b/dev/Boot/arm64-mobile.make
@@ -19,7 +19,7 @@ EMU=qemu-system-aarch64
 endif
 
 ifeq ($(NEWS_MODEL), )
-ZKA_MODEL=-DkMachineModel="\"ZKA\""
+NE_MODEL=-DkMachineModel="\"ZKA\""
 endif
 
 BIOS=OVMF.fd
@@ -44,9 +44,9 @@ REM=rm
 REM_FLAG=-f
 
 FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
+FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \
 			 -target aarch64-unknown-windows \
-				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../Kernel
+				-std=c++20 -DBOOTZ_EPM_SUPPORT -DkExpectedWidth=320 -DkExpectedHeight=480 -D__FSKIT_USE_NEFS__ -D__BOOTLDR_STANDALONE__ -D__NEOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_NE_APIS__ -D__NE__ -I../ -I../Kernel
 
 BOOT_LOADER=zbaosldr.exe
 KERNEL=neoskrnl.exe
@@ -74,7 +74,7 @@ endif
 .PHONY: compile
 compile:
 	$(RESCMD)
-	$(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
+	$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
 	$(wildcard src/HEL/ARM64/*.cc) \
 	$(wildcard src/HEL/ARM64/*.S) \
 	$(wildcard src/*.cc)
diff --git a/dev/Boot/src/BootThread.cc b/dev/Boot/src/BootThread.cc
index 4b7dfdfb..ddfa1018 100644
--- a/dev/Boot/src/BootThread.cc
+++ b/dev/Boot/src/BootThread.cc
@@ -47,21 +47,21 @@ namespace Boot
 			if (!header_ptr || !opt_header_ptr)
 				return;
 
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 			if (header_ptr->mMachine != kPeMachineAMD64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
 				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
-#elif defined(__ZKA_ARM64__)
+#elif defined(__NE_ARM64__)
 			if (header_ptr->mMachine != kPeMachineARM64 ||
 				header_ptr->mSignature != kPeSignature)
 			{
 				writer.Write("BootZ: Not a PE32+ executable.\r");
 				return;
 			}
-#endif // __ZKA_AMD64__ || __ZKA_ARM64__
+#endif // __NE_AMD64__ || __NE_ARM64__
 
 			if (opt_header_ptr->mSubsystem != kZKASubsystem)
 			{
@@ -119,7 +119,7 @@ namespace Boot
 					if (handover_struc->HandoverMagic != kHandoverMagic &&
 						handover_struc->HandoverType != HEL::kTypeKernel)
 					{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
 						if (handover_struc->HandoverArch != HEL::kArchAMD64)
 						{
 							fb_render_string("BootZ: Not an handover header, bad CPU...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
@@ -127,7 +127,7 @@ namespace Boot
 						}
 #endif
 
-#ifdef __ZKA_ARM64__
+#ifdef __NE_ARM64__
 						if (handover_struc->HandoverArch != HEL::kArchARM64)
 						{
 							fb_render_string("BootZ: Not an handover header, bad CPU...", 40, 10, RGB(0xFF, 0xFF, 0xFF));
diff --git a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
index 3243e482..f8aa38d9 100644
--- a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc
@@ -145,7 +145,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	FB::fb_clear_video();
 
-	FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2);
+	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
 
 	fb_clear();
 
@@ -186,7 +186,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	for (; struct_ptr[lookup_index].Kind != EfiMemoryType::EfiConventionalMemory; ++lookup_index)
 	{
-		ZKA_UNUSED(0);
+		NE_UNUSED(0);
 	}
 
 	kDefaultMemoryMap = lookup_index;
@@ -247,7 +247,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 			FB::fb_clear_video();
 
-			FBDrawBitMapInRegion(zka_has_disk, ZKA_HAS_DISK_WIDTH, ZKA_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_HAS_DISK_HEIGHT) / 2);
+			FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2);
 
 			fb_clear();
 		}
@@ -306,7 +306,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 	else
 	{
 		fb_init();
-		FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2);
+		FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2);
 
 		EFI::Stop();
 	}
diff --git a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
index 71777528..f7e9d9bc 100644
--- a/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
+++ b/dev/Boot/src/HEL/ARM64/CoreBootStartup.S
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __ZKA_COREBOOT__
+#ifdef __NE_COREBOOT__
 
 .section .boot_hdr
 .align 4
@@ -37,4 +37,4 @@ bootloader_start:
     bl      bootloader_main             
     ret                                 
 
-#endif // __ZKA_COREBOOT__
\ No newline at end of file
+#endif // __NE_COREBOOT__
\ No newline at end of file
diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
index 0e53c99d..adc5cf40 100644
--- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
+++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc
@@ -142,7 +142,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 
 	FB::fb_clear_video();
 
-	FBDrawBitMapInRegion(zka_disk, ZKA_DISK_WIDTH, ZKA_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2);
+	FBDrawBitMapInRegion(zka_disk, NE_DISK_WIDTH, NE_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_DISK_HEIGHT) / 2);
 
 	fb_clear();