summaryrefslogtreecommitdiffhomepage
path: root/dev/Kernel/KernelKit
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-31 19:05:36 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2025-01-31 19:05:36 +0100
commitd0c7a3e05a1bb5c9cffd1a0946e403d3a8e37e63 (patch)
tree686f7f3c99a08a7bebfc925839f0f9d882177c54 /dev/Kernel/KernelKit
parent9c1e80e1bb3a8d549a9053f0d7bf4afb0c806f80 (diff)
Match the changes in OpenNE, (without reusing it)
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Kernel/KernelKit')
-rw-r--r--dev/Kernel/KernelKit/DebugOutput.h4
-rw-r--r--dev/Kernel/KernelKit/DeviceMgr.h4
-rw-r--r--dev/Kernel/KernelKit/DriveMgr.h2
-rw-r--r--dev/Kernel/KernelKit/FileMgr.h4
-rw-r--r--dev/Kernel/KernelKit/HardwareThreadScheduler.h4
-rw-r--r--dev/Kernel/KernelKit/IDylibObject.h4
-rw-r--r--dev/Kernel/KernelKit/IPEFDylibObject.h4
-rw-r--r--dev/Kernel/KernelKit/LoaderInterface.h2
-rw-r--r--dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl4
-rw-r--r--dev/Kernel/KernelKit/PCI/Iterator.h8
-rw-r--r--dev/Kernel/KernelKit/PEFCodeMgr.h2
-rw-r--r--dev/Kernel/KernelKit/Semaphore.h2
-rw-r--r--dev/Kernel/KernelKit/Timer.h6
-rw-r--r--dev/Kernel/KernelKit/User.h2
-rw-r--r--dev/Kernel/KernelKit/UserProcessScheduler.h6
-rw-r--r--dev/Kernel/KernelKit/UserProcessScheduler.inl2
16 files changed, 30 insertions, 30 deletions
diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h
index 0f02ecb1..d51e8d4d 100644
--- a/dev/Kernel/KernelKit/DebugOutput.h
+++ b/dev/Kernel/KernelKit/DebugOutput.h
@@ -35,7 +35,7 @@ namespace Kernel
inline TerminalDevice hex_number(const Long& x);
// @brief Emulates a VT100 terminal.
- class TerminalDevice final ZKA_DEVICE<const Char*>
+ class TerminalDevice final NE_DEVICE<const Char*>
{
public:
TerminalDevice(void (*print)(const Char*), void (*gets)(const Char*))
@@ -52,7 +52,7 @@ namespace Kernel
return ("TerminalDevice");
}
- ZKA_COPY_DEFAULT(TerminalDevice);
+ NE_COPY_DEFAULT(TerminalDevice);
STATIC TerminalDevice The() noexcept;
};
diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/Kernel/KernelKit/DeviceMgr.h
index 9e867561..c6c2bb32 100644
--- a/dev/Kernel/KernelKit/DeviceMgr.h
+++ b/dev/Kernel/KernelKit/DeviceMgr.h
@@ -9,7 +9,7 @@
Revision History:
31/01/24: Add kDeviceCnt (amlel)
- 15/11/24: Add ZKA_DEVICE macro, to inherit from device object.
+ 15/11/24: Add NE_DEVICE macro, to inherit from device object.
------------------------------------------- */
@@ -24,7 +24,7 @@
#define kDeviceMgrRootDirPath "/Devices/"
-#define ZKA_DEVICE : public ::Kernel::IDeviceObject
+#define NE_DEVICE : public ::Kernel::IDeviceObject
// Last Rev: Wed, Apr 3, 2024 9:09:41 AM
diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/Kernel/KernelKit/DriveMgr.h
index e28e7cb7..e8e6b95f 100644
--- a/dev/Kernel/KernelKit/DriveMgr.h
+++ b/dev/Kernel/KernelKit/DriveMgr.h
@@ -89,7 +89,7 @@ namespace Kernel
explicit MountpointInterface() = default;
~MountpointInterface() = default;
- ZKA_COPY_DEFAULT(MountpointInterface);
+ NE_COPY_DEFAULT(MountpointInterface);
public:
DriveTrait& A()
diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h
index 942ff392..b3430557 100644
--- a/dev/Kernel/KernelKit/FileMgr.h
+++ b/dev/Kernel/KernelKit/FileMgr.h
@@ -87,7 +87,7 @@ namespace Kernel
virtual ~IFilesystemMgr() = default;
public:
- ZKA_COPY_DEFAULT(IFilesystemMgr);
+ NE_COPY_DEFAULT(IFilesystemMgr);
public:
/// @brief Mounts a new filesystem into an active state.
@@ -153,7 +153,7 @@ namespace Kernel
~NeFileSystemMgr() override;
public:
- ZKA_COPY_DEFAULT(NeFileSystemMgr);
+ NE_COPY_DEFAULT(NeFileSystemMgr);
public:
NodePtr Create(const Char* path) override;
diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/Kernel/KernelKit/HardwareThreadScheduler.h
index 56fc57ff..c805768b 100644
--- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h
+++ b/dev/Kernel/KernelKit/HardwareThreadScheduler.h
@@ -51,7 +51,7 @@ namespace Kernel
~HardwareThread();
public:
- ZKA_COPY_DEFAULT(HardwareThread)
+ NE_COPY_DEFAULT(HardwareThread)
public:
operator bool();
@@ -97,7 +97,7 @@ namespace Kernel
public:
explicit HardwareThreadScheduler();
~HardwareThreadScheduler();
- ZKA_COPY_DEFAULT(HardwareThreadScheduler);
+ NE_COPY_DEFAULT(HardwareThreadScheduler);
public:
HAL::StackFramePtr Leak() noexcept;
diff --git a/dev/Kernel/KernelKit/IDylibObject.h b/dev/Kernel/KernelKit/IDylibObject.h
index a7602be6..d3be6432 100644
--- a/dev/Kernel/KernelKit/IDylibObject.h
+++ b/dev/Kernel/KernelKit/IDylibObject.h
@@ -12,7 +12,7 @@
#include <NewKit/Defines.h>
#include <CompilerKit/CompilerKit.h>
-#define ZKA_DLL_OBJECT : public IDylibObject
+#define NE_DLL_OBJECT : public IDylibObject
namespace Kernel
{
@@ -34,7 +34,7 @@ namespace Kernel
}
};
- ZKA_COPY_DEFAULT(IDylibObject);
+ NE_COPY_DEFAULT(IDylibObject);
virtual DLL_TRAITS** GetAddressOf() = 0;
virtual DLL_TRAITS* Get() = 0;
diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/Kernel/KernelKit/IPEFDylibObject.h
index 68493c86..14b4fd62 100644
--- a/dev/Kernel/KernelKit/IPEFDylibObject.h
+++ b/dev/Kernel/KernelKit/IPEFDylibObject.h
@@ -22,14 +22,14 @@ namespace Kernel
* @brief Shared Library class
* Load library from this class
*/
- class IPEFDylibObject final ZKA_DLL_OBJECT
+ class IPEFDylibObject final NE_DLL_OBJECT
{
public:
explicit IPEFDylibObject() = default;
~IPEFDylibObject() = default;
public:
- ZKA_COPY_DEFAULT(IPEFDylibObject);
+ NE_COPY_DEFAULT(IPEFDylibObject);
private:
DLL_TRAITS* fMounted{nullptr};
diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h
index c2c9a595..1cccb2b3 100644
--- a/dev/Kernel/KernelKit/LoaderInterface.h
+++ b/dev/Kernel/KernelKit/LoaderInterface.h
@@ -21,7 +21,7 @@ namespace Kernel
explicit LoaderInterface() = default;
virtual ~LoaderInterface() = default;
- ZKA_COPY_DEFAULT(LoaderInterface);
+ NE_COPY_DEFAULT(LoaderInterface);
public:
virtual _Output ErrorOr<VoidPtr> GetBlob() = 0;
diff --git a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
index 7eb5b405..a6fc8c79 100644
--- a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -20,7 +20,7 @@ namespace Kernel
{
switch (sizeof(T))
{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
case 4:
return HAL::rt_in32(fPorts[index].Leak());
case 2:
@@ -39,7 +39,7 @@ namespace Kernel
{
switch (sizeof(T))
{
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
case 4:
HAL::rt_out32(fPorts[index].Leak(), value);
case 2:
diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/Kernel/KernelKit/PCI/Iterator.h
index 012d5f00..d5044c1e 100644
--- a/dev/Kernel/KernelKit/PCI/Iterator.h
+++ b/dev/Kernel/KernelKit/PCI/Iterator.h
@@ -13,9 +13,9 @@
#include <NewKit/Defines.h>
#include <NewKit/Ref.h>
-#define ZKA_BUS_COUNT (256)
-#define ZKA_DEVICE_COUNT (33)
-#define ZKA_FUNCTION_COUNT (8)
+#define NE_BUS_COUNT (256)
+#define NE_DEVICE_COUNT (33)
+#define NE_FUNCTION_COUNT (8)
namespace Kernel::PCI
{
@@ -36,7 +36,7 @@ namespace Kernel::PCI
Ref<PCI::Device> operator[](const Size& sz);
private:
- Array<PCI::Device, ZKA_BUS_COUNT> fDevices;
+ Array<PCI::Device, NE_BUS_COUNT> fDevices;
};
} // namespace Kernel::PCI
diff --git a/dev/Kernel/KernelKit/PEFCodeMgr.h b/dev/Kernel/KernelKit/PEFCodeMgr.h
index 25fb7f9b..f6772346 100644
--- a/dev/Kernel/KernelKit/PEFCodeMgr.h
+++ b/dev/Kernel/KernelKit/PEFCodeMgr.h
@@ -35,7 +35,7 @@ namespace Kernel
~PEFLoader() override;
public:
- ZKA_COPY_DEFAULT(PEFLoader);
+ NE_COPY_DEFAULT(PEFLoader);
public:
const Char* Path() override;
diff --git a/dev/Kernel/KernelKit/Semaphore.h b/dev/Kernel/KernelKit/Semaphore.h
index 7d149027..67b4b540 100644
--- a/dev/Kernel/KernelKit/Semaphore.h
+++ b/dev/Kernel/KernelKit/Semaphore.h
@@ -35,7 +35,7 @@ namespace Kernel
bool LockOrWait(UserProcess& process, TimerInterface* timer);
public:
- ZKA_COPY_DEFAULT(Semaphore);
+ NE_COPY_DEFAULT(Semaphore);
private:
UserProcessRef fLockingProcess;
diff --git a/dev/Kernel/KernelKit/Timer.h b/dev/Kernel/KernelKit/Timer.h
index 2fa2dfa6..d7b38157 100644
--- a/dev/Kernel/KernelKit/Timer.h
+++ b/dev/Kernel/KernelKit/Timer.h
@@ -22,7 +22,7 @@ namespace Kernel
virtual ~TimerInterface() = default;
public:
- ZKA_COPY_DEFAULT(TimerInterface);
+ NE_COPY_DEFAULT(TimerInterface);
public:
virtual BOOL Wait() noexcept;
@@ -35,7 +35,7 @@ namespace Kernel
~SoftwareTimer() override;
public:
- ZKA_COPY_DEFAULT(SoftwareTimer);
+ NE_COPY_DEFAULT(SoftwareTimer);
public:
BOOL Wait() noexcept override;
@@ -52,7 +52,7 @@ namespace Kernel
~HardwareTimer() override;
public:
- ZKA_COPY_DEFAULT(HardwareTimer);
+ NE_COPY_DEFAULT(HardwareTimer);
public:
BOOL Wait() noexcept override;
diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h
index 2fb832d4..67a4c105 100644
--- a/dev/Kernel/KernelKit/User.h
+++ b/dev/Kernel/KernelKit/User.h
@@ -50,7 +50,7 @@ namespace Kernel
~User();
public:
- ZKA_COPY_DEFAULT(User);
+ NE_COPY_DEFAULT(User);
public:
bool operator==(const User& lhs);
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h
index 013f903e..a08278f2 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.h
+++ b/dev/Kernel/KernelKit/UserProcessScheduler.h
@@ -153,7 +153,7 @@ namespace Kernel
~UserProcess();
public:
- ZKA_COPY_DEFAULT(UserProcess);
+ NE_COPY_DEFAULT(UserProcess);
public:
Char Name[kProcessNameLen] = {"Process"};
@@ -261,7 +261,7 @@ namespace Kernel
explicit UserProcessTeam();
~UserProcessTeam() = default;
- ZKA_COPY_DEFAULT(UserProcessTeam);
+ NE_COPY_DEFAULT(UserProcessTeam);
Array<UserProcess, kSchedProcessLimitPerTeam>& AsArray();
Ref<UserProcess>& AsRef();
@@ -288,7 +288,7 @@ namespace Kernel
explicit UserProcessScheduler() = default;
~UserProcessScheduler() override = default;
- ZKA_COPY_DEFAULT(UserProcessScheduler)
+ NE_COPY_DEFAULT(UserProcessScheduler)
operator bool();
bool operator!();
diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.inl b/dev/Kernel/KernelKit/UserProcessScheduler.inl
index 6f1f3f4a..be6025d5 100644
--- a/dev/Kernel/KernelKit/UserProcessScheduler.inl
+++ b/dev/Kernel/KernelKit/UserProcessScheduler.inl
@@ -28,7 +28,7 @@ namespace Kernel
{
this->UsedMemory -= entry->MemoryEntrySize;
-#ifdef __ZKA_AMD64__
+#ifdef __NE_AMD64__
auto pd = hal_read_cr3();
hal_write_cr3(this->VMRegister);