From ba7b3ed69cd24970a28b72c54982735cd120e663 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 19:57:33 +0100 Subject: kernel: breaking: Change namespace from NeOS to Kernel. sched: Fix redundancy in NeKernel's user scheduler macros, refactored the other files using the redundant macros too. part one of a series of commit for NeKernel. Signed-off-by: Amlal El Mahrouss --- dev/boot/BootKit/BootKit.h | 10 +++++----- dev/boot/BootKit/BootThread.h | 4 ++-- dev/boot/BootKit/Device.h | 2 +- dev/boot/BootKit/HW/ATA.h | 2 +- dev/boot/BootKit/HW/SATA.h | 10 +++++----- dev/boot/BootKit/Qr.h | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'dev/boot/BootKit') diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h index d8c33db0..05ed9405 100644 --- a/dev/boot/BootKit/BootKit.h +++ b/dev/boot/BootKit/BootKit.h @@ -53,7 +53,7 @@ namespace Boot typedef WideChar CharacterTypeUTF16; typedef Char CharacterTypeUTF8; - using namespace NeOS; + using namespace Kernel; /** * @brief BootKit Text Writer class @@ -86,17 +86,17 @@ namespace Boot BootTextWriter(const BootTextWriter&) = default; }; - NeOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NeOS::SizeT len); + Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len); - NeOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NeOS::SizeT len); + Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len); /// String length functions. /// @brief get string length. - NeOS::SizeT BStrLen(const CharacterTypeUTF16* ptr); + Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr); /// @brief set memory with custom value. - NeOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NeOS::SizeT len); + Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len); /** * @brief BootKit File Reader class diff --git a/dev/boot/BootKit/BootThread.h b/dev/boot/BootKit/BootThread.h index 6e48d190..333dad9f 100644 --- a/dev/boot/BootKit/BootThread.h +++ b/dev/boot/BootKit/BootThread.h @@ -12,7 +12,7 @@ namespace Boot { - using namespace NeOS; + using namespace Kernel; class BootThread; @@ -23,7 +23,7 @@ namespace Boot explicit BootThread() = delete; ~BootThread() = default; - explicit BootThread(NeOS::VoidPtr blob); + explicit BootThread(Kernel::VoidPtr blob); BootThread& operator=(const BootThread&) = default; BootThread(const BootThread&) = default; diff --git a/dev/boot/BootKit/Device.h b/dev/boot/BootKit/Device.h index acdaa478..8626390b 100644 --- a/dev/boot/BootKit/Device.h +++ b/dev/boot/BootKit/Device.h @@ -9,7 +9,7 @@ #include #include -using namespace NeOS; +using namespace Kernel; /// @brief Device type. class Device diff --git a/dev/boot/BootKit/HW/ATA.h b/dev/boot/BootKit/HW/ATA.h index 39b66db4..ef54457b 100644 --- a/dev/boot/BootKit/HW/ATA.h +++ b/dev/boot/BootKit/HW/ATA.h @@ -9,7 +9,7 @@ #include #include -using namespace NeOS; +using namespace Kernel; class BootDeviceATA final : public Device { diff --git a/dev/boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h index 10868cd9..6ae18740 100644 --- a/dev/boot/BootKit/HW/SATA.h +++ b/dev/boot/BootKit/HW/SATA.h @@ -19,9 +19,9 @@ public: struct SATATrait final { - NeOS::SizeT mBase{1024}; - NeOS::Boolean mErr{false}; - NeOS::Boolean mDetected{false}; + Kernel::SizeT mBase{1024}; + Kernel::Boolean mErr{false}; + Kernel::Boolean mDetected{false}; operator bool() { @@ -34,8 +34,8 @@ public: return this->Leak().mDetected; } - BootDeviceSATA& Read(NeOS::WideChar* Buf, const NeOS::SizeT& SecCount); - BootDeviceSATA& Write(NeOS::WideChar* Buf, const NeOS::SizeT& SecCount); + BootDeviceSATA& Read(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); + BootDeviceSATA& Write(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); SATATrait& Leak(); diff --git a/dev/boot/BootKit/Qr.h b/dev/boot/BootKit/Qr.h index d51c9c10..760d8b7f 100644 --- a/dev/boot/BootKit/Qr.h +++ b/dev/boot/BootKit/Qr.h @@ -965,9 +965,9 @@ namespace qr }; } // namespace qr -namespace NeOS::Qr +namespace Kernel::Qr { using namespace qr; -} // namespace NeOS::Qr +} // namespace Kernel::Qr #endif // QR_H \ No newline at end of file -- cgit v1.2.3