diff options
| author | Amlal <amlal.elmahrouss@icloud.com> | 2025-02-20 12:32:38 +0100 |
|---|---|---|
| committer | Amlal <amlal.elmahrouss@icloud.com> | 2025-02-20 12:38:04 +0100 |
| commit | 7d2a7e7cab23b8217498866615a3719e5d3980ee (patch) | |
| tree | 75b87af3d8be10f29f2d5c69af17a9455c90df73 /dev/Boot | |
| parent | aa8a096ad429640e752d69a89c572da35493d4c0 (diff) | |
NeOS: Namespace change from 'Kernel' to 'NeOS'
ADD: Start defining the Workstation's HPFS (High-Performance File System)
Signed-off-by: Amlal <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Boot')
| -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 | ||||
| -rw-r--r-- | dev/Boot/Mod/NetBoot/NetBoot.cc | 2 | ||||
| -rw-r--r-- | dev/Boot/Mod/NetBoot/NetBoot.h | 20 | ||||
| -rw-r--r-- | dev/Boot/Mod/SysChk/Module.cc | 2 | ||||
| -rw-r--r-- | dev/Boot/src/BootString.cc | 14 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootATA.cc | 4 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootPlatform.cc | 2 |
12 files changed, 38 insertions, 38 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 diff --git a/dev/Boot/Mod/NetBoot/NetBoot.cc b/dev/Boot/Mod/NetBoot/NetBoot.cc index ea2cd73e..ac87d256 100644 --- a/dev/Boot/Mod/NetBoot/NetBoot.cc +++ b/dev/Boot/Mod/NetBoot/NetBoot.cc @@ -10,7 +10,7 @@ #include <Mod/NetBoot/NetBoot.h> #include <BootKit/BootKit.h> -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) +EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) { #ifdef __NE_AMD64__ return kEfiFail; diff --git a/dev/Boot/Mod/NetBoot/NetBoot.h b/dev/Boot/Mod/NetBoot/NetBoot.h index 2375ef18..e3a95c5f 100644 --- a/dev/Boot/Mod/NetBoot/NetBoot.h +++ b/dev/Boot/Mod/NetBoot/NetBoot.h @@ -17,15 +17,15 @@ /// @brief the internet header is used to download updates OTA. typedef struct NetBootInternetHeader { - Kernel::Char NB1; /// magic char 1 'N' - Kernel::Char NB2; /// magic char 2 'E' - Kernel::Char NB3; /// magic char 3 'T' - Kernel::Char NB4; /// magic char 4 'B' + NeOS::Char NB1; /// magic char 1 'N' + NeOS::Char NB2; /// magic char 2 'E' + NeOS::Char NB3; /// magic char 3 'T' + NeOS::Char NB4; /// magic char 4 'B' - Kernel::Char PatchName[255]; /// example: Modjo - Kernel::Int32 PatchLength; /// the patch length. - Kernel::Char PatchTarget[255]; /// the target file. - Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? - Kernel::Boolean Preflight; /// is it a preflight packet. - Kernel::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** + NeOS::Char PatchName[255]; /// example: Modjo + NeOS::Int32 PatchLength; /// the patch length. + NeOS::Char PatchTarget[255]; /// the target file. + NeOS::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? + NeOS::Boolean Preflight; /// is it a preflight packet. + NeOS::Char Data[]; /// non preflight packet has a patch blob for a **PatchTarget** } NetBootInternetHeader; diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc index 79f4170f..ef27796b 100644 --- a/dev/Boot/Mod/SysChk/Module.cc +++ b/dev/Boot/Mod/SysChk/Module.cc @@ -21,7 +21,7 @@ #include <BootKit/BootThread.h> #include <Mod/CoreGfx/FBMgr.h> -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) +EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) { #ifdef __NE_AMD64__ Boot::BDiskFormatFactory<BootDeviceATA> partition_factory; diff --git a/dev/Boot/src/BootString.cc b/dev/Boot/src/BootString.cc index 29b01682..194261d0 100644 --- a/dev/Boot/src/BootString.cc +++ b/dev/Boot/src/BootString.cc @@ -19,7 +19,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////// -Kernel::SizeT Boot::BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len) +NeOS::SizeT Boot::BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const NeOS::SizeT len) { if (!dest || !src) return 0; @@ -33,12 +33,12 @@ Kernel::SizeT Boot::BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, return index; } -Kernel::SizeT Boot::BStrLen(const CharacterTypeUTF16* ptr) +NeOS::SizeT Boot::BStrLen(const CharacterTypeUTF16* ptr) { if (!ptr) return 0; - Kernel::SizeT cnt = 0; + NeOS::SizeT cnt = 0; while (*ptr != (CharacterTypeUTF16)0) { @@ -49,12 +49,12 @@ Kernel::SizeT Boot::BStrLen(const CharacterTypeUTF16* ptr) return cnt; } -Kernel::SizeT Boot::BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const Kernel::SizeT len) +NeOS::SizeT Boot::BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 byte, const NeOS::SizeT len) { if (!src) return 0; - Kernel::SizeT cnt = 0UL; + NeOS::SizeT cnt = 0UL; while (*src != 0) { @@ -70,12 +70,12 @@ Kernel::SizeT Boot::BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 by return cnt; } -Kernel::SizeT Boot::BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const Kernel::SizeT len) +NeOS::SizeT Boot::BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, const NeOS::SizeT len) { if (!src) return 0; - Kernel::SizeT cnt = 0UL; + NeOS::SizeT cnt = 0UL; while (*src != 0) { diff --git a/dev/Boot/src/HEL/AMD64/BootATA.cc b/dev/Boot/src/HEL/AMD64/BootATA.cc index 0d6acb23..cc6c36b7 100644 --- a/dev/Boot/src/HEL/AMD64/BootATA.cc +++ b/dev/Boot/src/HEL/AMD64/BootATA.cc @@ -100,7 +100,7 @@ ATAInit_Retry: for (SizeT indexData = 0ul; indexData < kATADataLen; ++indexData) { - kATAData[indexData] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + kATAData[indexData] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); } OutBus = @@ -136,7 +136,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) { boot_ata_wait_io(IO); - Buf[IndexOff] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + Buf[IndexOff] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); boot_ata_wait_io(IO); } } diff --git a/dev/Boot/src/HEL/AMD64/BootPlatform.cc b/dev/Boot/src/HEL/AMD64/BootPlatform.cc index 79c96bdf..c7ae4085 100644 --- a/dev/Boot/src/HEL/AMD64/BootPlatform.cc +++ b/dev/Boot/src/HEL/AMD64/BootPlatform.cc @@ -100,7 +100,7 @@ EXTERN_C UInt32 rt_in32(UInt16 port) void rt_hlt() { - Kernel::HAL::rt_halt(); + NeOS::HAL::rt_halt(); } #endif // __BOOTLDR_STANDALONE__ |
