From 375d0210dcb2070a12d916523f4a1dafff28360c Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Tue, 2 Jul 2024 22:00:35 +0200 Subject: MHR-36: Change namespace name, got out of the codename stage. Signed-off-by: Amlal EL Mahrouss --- Boot/BootKit/BootKit.hxx | 10 +++++----- Boot/BootKit/Device.hxx | 2 +- Boot/BootKit/HW/ATA.hxx | 2 +- Boot/BootKit/HW/SATA.hxx | 10 +++++----- Boot/BootKit/Vendor/Qr.hxx | 4 ++-- Boot/NetBoot/NetBoot.hxx | 4 ++-- Boot/Sources/HEL/AMD64/BootPlatform.cxx | 2 +- Boot/Sources/HEL/AMD64/BootString.cxx | 14 +++++++------- 8 files changed, 24 insertions(+), 24 deletions(-) (limited to 'Boot') diff --git a/Boot/BootKit/BootKit.hxx b/Boot/BootKit/BootKit.hxx index a253f137..309755df 100644 --- a/Boot/BootKit/BootKit.hxx +++ b/Boot/BootKit/BootKit.hxx @@ -39,7 +39,7 @@ class BFileReader; class BFileRunner; class BVersionString; -using namespace NewOS; +using namespace Kernel; typedef Char* PEFImagePtr; typedef Char* PEImagePtr; @@ -76,17 +76,17 @@ public: BTextWriter(const BTextWriter&) = default; }; -NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NewOS::SizeT len); +Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len); -NewOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NewOS::SizeT len); +Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len); /// String length functions. /// @brief get string length. -NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr); +Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr); /// @brief set memory with custom value. -NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NewOS::SizeT len); +Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len); /** * @brief BootKit File Reader class diff --git a/Boot/BootKit/Device.hxx b/Boot/BootKit/Device.hxx index ca427dc7..234ab6bd 100644 --- a/Boot/BootKit/Device.hxx +++ b/Boot/BootKit/Device.hxx @@ -8,7 +8,7 @@ #include -using namespace NewOS; +using namespace Kernel; /// @brief Device type. class Device diff --git a/Boot/BootKit/HW/ATA.hxx b/Boot/BootKit/HW/ATA.hxx index e789a48f..569c2a86 100644 --- a/Boot/BootKit/HW/ATA.hxx +++ b/Boot/BootKit/HW/ATA.hxx @@ -9,7 +9,7 @@ #include #include -using namespace NewOS; +using namespace Kernel; class BootDeviceATA final : public Device { diff --git a/Boot/BootKit/HW/SATA.hxx b/Boot/BootKit/HW/SATA.hxx index f41879cc..bf6c7e82 100644 --- a/Boot/BootKit/HW/SATA.hxx +++ b/Boot/BootKit/HW/SATA.hxx @@ -19,9 +19,9 @@ public: struct SATATrait final { - NewOS::SizeT mBase{1024}; - NewOS::Boolean mErr{false}; - NewOS::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(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount); - BootDeviceSATA& Write(NewOS::WideChar* Buf, const NewOS::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/Boot/BootKit/Vendor/Qr.hxx b/Boot/BootKit/Vendor/Qr.hxx index 1cfc214e..bb560878 100644 --- a/Boot/BootKit/Vendor/Qr.hxx +++ b/Boot/BootKit/Vendor/Qr.hxx @@ -965,9 +965,9 @@ namespace qr }; } // namespace qr -namespace NewOS::Qr +namespace Kernel::Qr { using namespace qr; -} // namespace NewOS::Qr +} // namespace Kernel::Qr #endif diff --git a/Boot/NetBoot/NetBoot.hxx b/Boot/NetBoot/NetBoot.hxx index e3119c5f..24176c4a 100644 --- a/Boot/NetBoot/NetBoot.hxx +++ b/Boot/NetBoot/NetBoot.hxx @@ -20,7 +20,7 @@ typedef struct NetBootInternetHeader CharacterTypeUTF8 NB4; /// magic char 4 'B' CharacterTypeUTF8 PatchName[255]; /// example: ColdChoco - NewOS::Int32 PatchLength; /// the patch length. + Kernel::Int32 PatchLength; /// the patch length. CharacterTypeUTF8 PatchTarget[255]; /// the target file. - NewOS::Boolean ImpliesROM; /// does it implies EEPROM patching? + Kernel::Boolean ImpliesROM; /// does it implies EEPROM patching? } NetBootInternetHeader; diff --git a/Boot/Sources/HEL/AMD64/BootPlatform.cxx b/Boot/Sources/HEL/AMD64/BootPlatform.cxx index 66fe2f8d..e700a8de 100644 --- a/Boot/Sources/HEL/AMD64/BootPlatform.cxx +++ b/Boot/Sources/HEL/AMD64/BootPlatform.cxx @@ -96,7 +96,7 @@ EXTERN_C UInt32 In32(UInt16 port) void rt_hlt() { - NewOS::HAL::rt_halt(); + Kernel::HAL::rt_halt(); } #endif // 0 diff --git a/Boot/Sources/HEL/AMD64/BootString.cxx b/Boot/Sources/HEL/AMD64/BootString.cxx index 384cef33..f811130f 100644 --- a/Boot/Sources/HEL/AMD64/BootString.cxx +++ b/Boot/Sources/HEL/AMD64/BootString.cxx @@ -19,7 +19,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////// -NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NewOS::SizeT len) +Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len) { if (!dest || !src) return 0; @@ -33,12 +33,12 @@ NewOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const N return index; } -NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr) +Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr) { if (!ptr) return 0; - NewOS::SizeT cnt = 0; + Kernel::SizeT cnt = 0; while (*ptr != (CharacterTypeUTF16)0) { @@ -49,12 +49,12 @@ NewOS::SizeT BStrLen(const CharacterTypeUTF16* ptr) return cnt; } -NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NewOS::SizeT len) +Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len) { if (!src) return 0; - NewOS::SizeT cnt = 0UL; + Kernel::SizeT cnt = 0UL; while (*src != 0) { @@ -70,12 +70,12 @@ NewOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, con return cnt; } -NewOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NewOS::SizeT len) +Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len) { if (!src) return 0; - NewOS::SizeT cnt = 0UL; + Kernel::SizeT cnt = 0UL; while (*src != 0) { -- cgit v1.2.3