diff options
Diffstat (limited to 'dev/Boot/BootKit')
| -rw-r--r-- | dev/Boot/BootKit/BootKit.h | 10 | ||||
| -rw-r--r-- | dev/Boot/BootKit/BootThread.h | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Device.h | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/ATA.h | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/SATA.h | 10 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Qr.h | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index f8c07050..12018048 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -56,7 +56,7 @@ namespace Boot typedef WideChar CharacterTypeUTF16; typedef Char CharacterTypeUTF8; - using namespace Kernel; + using namespace NeOS; /** * @brief BootKit Text Writer class @@ -89,17 +89,17 @@ namespace Boot BTextWriter(const BTextWriter&) = default; }; - Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len); + NeOS::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NeOS::SizeT len); - Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len); + NeOS::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NeOS::SizeT len); /// String length functions. /// @brief get string length. - Kernel::SizeT BStrLen(const CharacterTypeUTF16* ptr); + NeOS::SizeT BStrLen(const CharacterTypeUTF16* ptr); /// @brief set memory with custom value. - Kernel::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len); + NeOS::SizeT BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NeOS::SizeT len); /** * @brief BootKit File Reader class diff --git a/dev/Boot/BootKit/BootThread.h b/dev/Boot/BootKit/BootThread.h index b08df035..83f6a92c 100644 --- a/dev/Boot/BootKit/BootThread.h +++ b/dev/Boot/BootKit/BootThread.h @@ -12,7 +12,7 @@ namespace Boot { - using namespace Kernel; + using namespace NeOS; class BootThread; @@ -23,7 +23,7 @@ namespace Boot explicit BootThread() = delete; ~BootThread() = default; - explicit BootThread(Kernel::VoidPtr blob); + explicit BootThread(NeOS::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 610a7a9a..78e9aa3f 100644 --- a/dev/Boot/BootKit/Device.h +++ b/dev/Boot/BootKit/Device.h @@ -9,7 +9,7 @@ #include <Mod/ATA/ATA.h> #include <Mod/AHCI/AHCI.h> -using namespace Kernel; +using namespace NeOS; /// @brief Device type. class Device diff --git a/dev/Boot/BootKit/HW/ATA.h b/dev/Boot/BootKit/HW/ATA.h index 600b7da0..d8cd00eb 100644 --- a/dev/Boot/BootKit/HW/ATA.h +++ b/dev/Boot/BootKit/HW/ATA.h @@ -9,7 +9,7 @@ #include <Mod/ATA/ATA.h> #include <BootKit/Device.h> -using namespace Kernel; +using namespace NeOS; class BootDeviceATA final : public Device { diff --git a/dev/Boot/BootKit/HW/SATA.h b/dev/Boot/BootKit/HW/SATA.h index 62082640..a58107b2 100644 --- a/dev/Boot/BootKit/HW/SATA.h +++ b/dev/Boot/BootKit/HW/SATA.h @@ -19,9 +19,9 @@ public: struct SATATrait final { - Kernel::SizeT mBase{1024}; - Kernel::Boolean mErr{false}; - Kernel::Boolean mDetected{false}; + NeOS::SizeT mBase{1024}; + NeOS::Boolean mErr{false}; + NeOS::Boolean mDetected{false}; operator bool() { @@ -34,8 +34,8 @@ public: return this->Leak().mDetected; } - BootDeviceSATA& Read(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); - BootDeviceSATA& Write(Kernel::WideChar* Buf, const Kernel::SizeT& SecCount); + BootDeviceSATA& Read(NeOS::WideChar* Buf, const NeOS::SizeT& SecCount); + BootDeviceSATA& Write(NeOS::WideChar* Buf, const NeOS::SizeT& SecCount); SATATrait& Leak(); diff --git a/dev/Boot/BootKit/Qr.h b/dev/Boot/BootKit/Qr.h index 0a30c6ca..f0476bc2 100644 --- a/dev/Boot/BootKit/Qr.h +++ b/dev/Boot/BootKit/Qr.h @@ -965,9 +965,9 @@ namespace qr }; } // namespace qr -namespace Kernel::Qr +namespace NeOS::Qr { using namespace qr; -} // namespace Kernel::Qr +} // namespace NeOS::Qr #endif // QR_H
\ No newline at end of file |
