summaryrefslogtreecommitdiffhomepage
path: root/dev/ZKA
diff options
context:
space:
mode:
Diffstat (limited to 'dev/ZKA')
-rw-r--r--dev/ZKA/ArchKit/ArchKit.hxx2
-rw-r--r--dev/ZKA/ArchKit/compile_flags.txt2
-rw-r--r--dev/ZKA/FirmwareKit/EFI/API.hxx2
-rw-r--r--dev/ZKA/FirmwareKit/EPM.hxx2
-rw-r--r--dev/ZKA/FirmwareKit/Handover.hxx3
-rw-r--r--dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx2
-rw-r--r--dev/ZKA/HALKit/compile_flags.txt2
-rw-r--r--dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl4
-rw-r--r--dev/ZKA/Sources/CxxAbi-AMD64.cxx4
-rw-r--r--dev/ZKA/Sources/PEFCodeManager.cxx2
-rw-r--r--dev/ZKA/Sources/PageManager.cxx4
-rw-r--r--dev/ZKA/Sources/Pmm.cxx4
-rw-r--r--dev/ZKA/Sources/compile_flags.txt2
-rw-r--r--dev/ZKA/amd64-efi.make2
-rw-r--r--dev/ZKA/compile_flags.txt2
15 files changed, 20 insertions, 19 deletions
diff --git a/dev/ZKA/ArchKit/ArchKit.hxx b/dev/ZKA/ArchKit/ArchKit.hxx
index ba05e243..bcaaf5f7 100644
--- a/dev/ZKA/ArchKit/ArchKit.hxx
+++ b/dev/ZKA/ArchKit/ArchKit.hxx
@@ -12,7 +12,7 @@
#include <FirmwareKit/Handover.hxx>
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
#include <HALKit/AMD64/HalPageAlloc.hxx>
#include <HALKit/AMD64/Hypervisor.hxx>
#include <HALKit/AMD64/Processor.hxx>
diff --git a/dev/ZKA/ArchKit/compile_flags.txt b/dev/ZKA/ArchKit/compile_flags.txt
index c15efc77..0fa2cfc6 100644
--- a/dev/ZKA/ArchKit/compile_flags.txt
+++ b/dev/ZKA/ArchKit/compile_flags.txt
@@ -4,5 +4,5 @@
-I./
-I../
-I$(HOME)/
--D__NEWOS_AMD64__
+-D__ZKA_AMD64__
-D__ED__
diff --git a/dev/ZKA/FirmwareKit/EFI/API.hxx b/dev/ZKA/FirmwareKit/EFI/API.hxx
index d666bbf2..c5c9de4c 100644
--- a/dev/ZKA/FirmwareKit/EFI/API.hxx
+++ b/dev/ZKA/FirmwareKit/EFI/API.hxx
@@ -12,7 +12,7 @@
#include <KernelKit/MSDOS.hxx>
#include <KernelKit/PE.hxx>
-#define kNewOSSubsystem 17
+#define kZKASubsystem 17
#ifdef __NEWOSLDR__
// forward decl.
diff --git a/dev/ZKA/FirmwareKit/EPM.hxx b/dev/ZKA/FirmwareKit/EPM.hxx
index 905e7f24..ee1d1c56 100644
--- a/dev/ZKA/FirmwareKit/EPM.hxx
+++ b/dev/ZKA/FirmwareKit/EPM.hxx
@@ -49,7 +49,7 @@
#define kEPMMagicError "EPM??"
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
#define kEPMMagic kEPMMagic86
#else
#ifdef __NEWOS_ARM64__
diff --git a/dev/ZKA/FirmwareKit/Handover.hxx b/dev/ZKA/FirmwareKit/Handover.hxx
index 1967d6de..5c09f79b 100644
--- a/dev/ZKA/FirmwareKit/Handover.hxx
+++ b/dev/ZKA/FirmwareKit/Handover.hxx
@@ -43,7 +43,8 @@ namespace Kernel::HEL
kTypeKernel = 100,
kTypeKernelDriver = 101,
kTypeRsrc = 102,
- kTypeCount = 3,
+ kTypeInvalid = 103,
+ kTypeCount = 4,
};
/**
diff --git a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
index 3677a1f2..27706784 100644
--- a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx
@@ -9,7 +9,7 @@
#define cVMHMagic (0xDEEFD00D)
#define cPaddingVMH (512)
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
#include <HALKit/AMD64/HalPageAlloc.hxx>
#elif defined(__NEWOS_ARM64__)
#include <HALKit/ARM64/HalPageAlloc.hxx>
diff --git a/dev/ZKA/HALKit/compile_flags.txt b/dev/ZKA/HALKit/compile_flags.txt
index 26779833..d6e35511 100644
--- a/dev/ZKA/HALKit/compile_flags.txt
+++ b/dev/ZKA/HALKit/compile_flags.txt
@@ -3,4 +3,4 @@
-std=c++20
-I./
-I../
--D__NEWOS_AMD64__
+-D__ZKA_AMD64__
diff --git a/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl
index b0252e63..84c24620 100644
--- a/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -20,7 +20,7 @@ namespace Kernel
{
switch (sizeof(T))
{
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
case 4:
return HAL::In32(fPorts[index].Leak());
case 2:
@@ -39,7 +39,7 @@ namespace Kernel
{
switch (sizeof(T))
{
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
case 4:
HAL::Out32(fPorts[index].Leak(), value);
case 2:
diff --git a/dev/ZKA/Sources/CxxAbi-AMD64.cxx b/dev/ZKA/Sources/CxxAbi-AMD64.cxx
index 5514336e..66fae2f5 100644
--- a/dev/ZKA/Sources/CxxAbi-AMD64.cxx
+++ b/dev/ZKA/Sources/CxxAbi-AMD64.cxx
@@ -4,7 +4,7 @@
------------------------------------------- */
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
#include <KernelKit/DebugOutput.hxx>
#include <NewKit/CxxAbi.hxx>
@@ -88,4 +88,4 @@ namespace cxxabiv1
}
} // namespace cxxabiv1
-#endif // ifdef __NEWOS_AMD64__
+#endif // ifdef __ZKA_AMD64__
diff --git a/dev/ZKA/Sources/PEFCodeManager.cxx b/dev/ZKA/Sources/PEFCodeManager.cxx
index 746b75eb..4a729992 100644
--- a/dev/ZKA/Sources/PEFCodeManager.cxx
+++ b/dev/ZKA/Sources/PEFCodeManager.cxx
@@ -24,7 +24,7 @@ namespace Kernel
return kPefArch32x0;
#elif defined(__NEWOS_64X0__)
return kPefArch64x0;
-#elif defined(__NEWOS_AMD64__)
+#elif defined(__ZKA_AMD64__)
return kPefArchAMD64;
#elif defined(__NEWOS_PPC64__)
return kPefArchPowerPC;
diff --git a/dev/ZKA/Sources/PageManager.cxx b/dev/ZKA/Sources/PageManager.cxx
index 868a9f7a..77dbfd32 100644
--- a/dev/ZKA/Sources/PageManager.cxx
+++ b/dev/ZKA/Sources/PageManager.cxx
@@ -7,11 +7,11 @@
#include <KernelKit/DebugOutput.hxx>
#include <NewKit/PageManager.hxx>
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
#include <HALKit/AMD64/HalPageAlloc.hxx>
#elif defined(__NEWOS_ARM64__)
#include <HALKit/ARM64/HalPageAlloc.hxx>
-#endif // ifdef __NEWOS_AMD64__ || defined(__NEWOS_ARM64__)
+#endif // ifdef __ZKA_AMD64__ || defined(__NEWOS_ARM64__)
//! null deref will throw (Page Zero detected, aborting app!)
#define kProtectedRegionEnd (512)
diff --git a/dev/ZKA/Sources/Pmm.cxx b/dev/ZKA/Sources/Pmm.cxx
index 4a511c30..62015f41 100644
--- a/dev/ZKA/Sources/Pmm.cxx
+++ b/dev/ZKA/Sources/Pmm.cxx
@@ -11,9 +11,9 @@
#include <HALKit/ARM64/Processor.hxx>
#endif // defined(__NEWOS_ARM64__)
-#if defined(__NEWOS_AMD64__)
+#if defined(__ZKA_AMD64__)
#include <HALKit/AMD64/Processor.hxx>
-#endif // defined(__NEWOS_AMD64__)
+#endif // defined(__ZKA_AMD64__)
namespace Kernel
{
diff --git a/dev/ZKA/Sources/compile_flags.txt b/dev/ZKA/Sources/compile_flags.txt
index b02c5e3d..33aadad4 100644
--- a/dev/ZKA/Sources/compile_flags.txt
+++ b/dev/ZKA/Sources/compile_flags.txt
@@ -4,4 +4,4 @@
-I../
-I$(HOME)/
-D__FSKIT_USE_NEWFS__
--D__NEWOS_AMD64__
+-D__ZKA_AMD64__
diff --git a/dev/ZKA/amd64-efi.make b/dev/ZKA/amd64-efi.make
index 3797e5ba..ad72bb00 100644
--- a/dev/ZKA/amd64-efi.make
+++ b/dev/ZKA/amd64-efi.make
@@ -5,7 +5,7 @@
CC = x86_64-w64-mingw32-g++
LD = x86_64-w64-mingw32-ld
-CCFLAGS = -fshort-wchar -c -shared -D__NEWOS_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \
+CCFLAGS = -fshort-wchar -c -shared -D__ZKA_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \
-std=c++20 -D__NEWOS_SUPPORT_NX__ -I../Vendor -D__FSKIT_USE_NEWFS__ \
-D__NEWOSKRNL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I./ -I../ -I../ZBA
diff --git a/dev/ZKA/compile_flags.txt b/dev/ZKA/compile_flags.txt
index 4087caba..290eeee3 100644
--- a/dev/ZKA/compile_flags.txt
+++ b/dev/ZKA/compile_flags.txt
@@ -3,7 +3,7 @@
-std=c++20
-I./
-I$(HOME)/
--D__NEWOS_AMD64__
+-D__ZKA_AMD64__
-I../Vendor
-D__x86_64__
-D__ED__
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-15 14:51:35 +0000