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 | |
| 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')
195 files changed, 1100 insertions, 1088 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__ diff --git a/dev/Kernel/ArchKit/ArchKit.h b/dev/Kernel/ArchKit/ArchKit.h index 4a232c86..36dabeb3 100644 --- a/dev/Kernel/ArchKit/ArchKit.h +++ b/dev/Kernel/ArchKit/ArchKit.h @@ -24,7 +24,7 @@ #error !!! unknown architecture !!! #endif -namespace Kernel +namespace NeOS { inline SSizeT rt_hash_seed(const Char* seed, int mul) { @@ -63,16 +63,16 @@ namespace Kernel { auto mm_is_bitmap(VoidPtr ptr) -> Bool; } -} // namespace Kernel +} // namespace NeOS #define kKernelMaxSystemCalls (256) -typedef Kernel::Void (*rt_syscall_proc)(Kernel::VoidPtr); +typedef NeOS::Void (*rt_syscall_proc)(NeOS::VoidPtr); struct HAL_SYSCALL_RECORD final { - Kernel::Int64 fHash; - Kernel::Bool fHooked; + NeOS::Int64 fHash; + NeOS::Bool fHooked; rt_syscall_proc fProc; operator bool() @@ -81,12 +81,12 @@ struct HAL_SYSCALL_RECORD final } }; -inline Kernel::Array<HAL_SYSCALL_RECORD, - kKernelMaxSystemCalls> +inline NeOS::Array<HAL_SYSCALL_RECORD, + kKernelMaxSystemCalls> kSyscalls; -inline Kernel::Array<HAL_SYSCALL_RECORD, - kKernelMaxSystemCalls> +inline NeOS::Array<HAL_SYSCALL_RECORD, + kKernelMaxSystemCalls> kKerncalls; -EXTERN_C Kernel::HAL::StackFramePtr mp_get_current_context(Kernel::Int64 pid); +EXTERN_C NeOS::HAL::StackFramePtr mp_get_current_context(NeOS::Int64 pid); diff --git a/dev/Kernel/CFKit/GUIDWizard.h b/dev/Kernel/CFKit/GUIDWizard.h index 6d195cf0..5236688f 100644 --- a/dev/Kernel/CFKit/GUIDWizard.h +++ b/dev/Kernel/CFKit/GUIDWizard.h @@ -17,8 +17,8 @@ namespace CFKit::XRN::Version1 { - using namespace Kernel; + using namespace NeOS; - Ref<GUIDSequence*> cf_make_sequence(const ArrayList<UInt32>& seq); - ErrorOr<Ref<Kernel::KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid); + Ref<GUIDSequence*> cf_make_sequence(const ArrayList<UInt32>& seq); + ErrorOr<Ref<NeOS::KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid); } // namespace CFKit::XRN::Version1 diff --git a/dev/Kernel/CFKit/GUIDWrapper.h b/dev/Kernel/CFKit/GUIDWrapper.h index 68c43033..3b7ada6d 100644 --- a/dev/Kernel/CFKit/GUIDWrapper.h +++ b/dev/Kernel/CFKit/GUIDWrapper.h @@ -17,7 +17,7 @@ // eXtensible Resource Information namespace CFKit::XRN { - using namespace Kernel; + using namespace NeOS; union GUIDSequence { alignas(8) UShort u8[16]; diff --git a/dev/Kernel/CFKit/Property.h b/dev/Kernel/CFKit/Property.h index b43434f6..e4588ad6 100644 --- a/dev/Kernel/CFKit/Property.h +++ b/dev/Kernel/CFKit/Property.h @@ -17,7 +17,7 @@ namespace CFKit { - using namespace Kernel; + using namespace NeOS; /// @brief handle to anything (number, ptr, string...) using PropertyId = UIntPtr; @@ -48,7 +48,7 @@ namespace CFKit using PropertyArray = Array<Property, N>; } // namespace CFKit -namespace Kernel +namespace NeOS { using namespace CFKit; } diff --git a/dev/Kernel/CFKit/Utils.h b/dev/Kernel/CFKit/Utils.h index 370eca45..4bf0696b 100644 --- a/dev/Kernel/CFKit/Utils.h +++ b/dev/Kernel/CFKit/Utils.h @@ -6,7 +6,7 @@ namespace CFKit { - using namespace Kernel; + using namespace NeOS; /// @brief Finds the PE header inside the blob. inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR diff --git a/dev/Kernel/FSKit/HPFS.h b/dev/Kernel/FSKit/HPFS.h index 762e2ce6..9e2a3e36 100644 --- a/dev/Kernel/FSKit/HPFS.h +++ b/dev/Kernel/FSKit/HPFS.h @@ -27,4 +27,18 @@ enum kHPFSDriveCount,
};
-struct HPFS_EXPLICIT_BOOT_SECTOR;
+struct HPFS_BOOT_NODE;
+
+struct HPFS_BOOT_NODE final
+{
+ NeOS::Char fMagic[kHPFSMagicLen];
+ NeOS::UInt32 fVersion;
+ NeOS::UInt64 fBadSectors;
+ NeOS::UInt64 fSectorCount;
+ NeOS::UInt64 fSectorSize;
+ NeOS::UInt32 fChecksum;
+ NeOS::UInt8 fDriveKind;
+ NeOS::UInt8 fTextEncoding;
+ NeOS::UInt64 fRootINode;
+ NeOS::UInt64 fRecoveryINode;
+};
\ No newline at end of file diff --git a/dev/Kernel/FSKit/IndexableProperty.h b/dev/Kernel/FSKit/IndexableProperty.h index 4117a1d4..a942cc7c 100644 --- a/dev/Kernel/FSKit/IndexableProperty.h +++ b/dev/Kernel/FSKit/IndexableProperty.h @@ -13,7 +13,7 @@ #define kIndexerNodeNameLength 255 #define kIndexerClaimed 0xCF -namespace Kernel +namespace NeOS { namespace Indexer { @@ -30,7 +30,7 @@ namespace Kernel explicit IndexableProperty() : Property() { - Kernel::KString strProp(kMaxPropLen); + NeOS::KString strProp(kMaxPropLen); strProp += "/prop/indexable"; this->GetKey() = strProp; @@ -60,4 +60,4 @@ namespace Kernel /// @return none. Void fs_index_file(const Char* filename, SizeT filenameLen, IndexableProperty& indexer); } // namespace Indexer -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index 0b690553..19123a4c 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -87,8 +87,8 @@ default. #define kNeFSLF '\r' #define kNeFSEOF (-1) -#define kNeFSBitWidth (sizeof(Kernel::Char)) -#define kNeFSLbaType (Kernel::Lba) +#define kNeFSBitWidth (sizeof(NeOS::Char)) +#define kNeFSLbaType (NeOS::Lba) /// @note Start after the partition map header. (Virtual addressing) #define kNeFSRootCatalogStartAddress (1024) @@ -142,38 +142,38 @@ struct PACKED NEFS_CATALOG_STRUCT final { BOOL ForkOrCatalog : 1 {0}; - Kernel::Char Name[kNeFSNodeNameLen] = {0}; - Kernel::Char Mime[kNeFSMimeNameLen] = {0}; + NeOS::Char Name[kNeFSNodeNameLen] = {0}; + NeOS::Char Mime[kNeFSMimeNameLen] = {0}; /// Catalog flags. - Kernel::UInt16 Flags; + NeOS::UInt16 Flags; /// Catalog allocation status. - Kernel::UInt16 Status; + NeOS::UInt16 Status; /// Custom catalog flags. - Kernel::UInt16 CatalogFlags; + NeOS::UInt16 CatalogFlags; /// Catalog kind. - Kernel::Int32 Kind; + NeOS::Int32 Kind; /// Size of the data fork. - Kernel::Lba DataForkSize; + NeOS::Lba DataForkSize; /// Size of all resource forks. - Kernel::Lba ResourceForkSize; + NeOS::Lba ResourceForkSize; /// Forks LBA. - Kernel::Lba DataFork; - Kernel::Lba ResourceFork; + NeOS::Lba DataFork; + NeOS::Lba ResourceFork; /// Tree allocation tracker. - Kernel::Lba NextSibling; - Kernel::Lba PrevSibling; + NeOS::Lba NextSibling; + NeOS::Lba PrevSibling; /// Best-buddy tracker. - Kernel::Lba NextBestSibling; - Kernel::Lba NextPrevSibling; + NeOS::Lba NextBestSibling; + NeOS::Lba NextPrevSibling; }; /// @brief Fork type, contains a data page. @@ -184,53 +184,53 @@ struct PACKED NEFS_FORK_STRUCT final { BOOL ForkOrCatalog : 1 {1}; - Kernel::Char ForkName[kNeFSForkNameLen] = {0}; - Kernel::Char CatalogName[kNeFSNodeNameLen] = {0}; + NeOS::Char ForkName[kNeFSForkNameLen] = {0}; + NeOS::Char CatalogName[kNeFSNodeNameLen] = {0}; - Kernel::Int32 Flags; - Kernel::Int32 Kind; + NeOS::Int32 Flags; + NeOS::Int32 Kind; - Kernel::Int64 ResourceId; - Kernel::Int32 ResourceKind; - Kernel::Int32 ResourceFlags; + NeOS::Int64 ResourceId; + NeOS::Int32 ResourceKind; + NeOS::Int32 ResourceFlags; - Kernel::Lba DataOffset; // 8 Where to look for this data? - Kernel::SizeT DataSize; /// Data size according using sector count. + NeOS::Lba DataOffset; // 8 Where to look for this data? + NeOS::SizeT DataSize; /// Data size according using sector count. - Kernel::Lba NextSibling; - Kernel::Lba PreviousSibling; + NeOS::Lba NextSibling; + NeOS::Lba PreviousSibling; - Kernel::Char Pad[2] = {0}; + NeOS::Char Pad[2] = {0}; }; /// @brief Partition block type struct PACKED NEFS_ROOT_PARTITION_BLOCK final { - Kernel::Char Ident[kNeFSIdentLen] = {0}; - Kernel::Char PartitionName[kNeFSPartLen] = {0}; + NeOS::Char Ident[kNeFSIdentLen] = {0}; + NeOS::Char PartitionName[kNeFSPartLen] = {0}; - Kernel::Int32 Flags; - Kernel::Int32 Kind; + NeOS::Int32 Flags; + NeOS::Int32 Kind; - Kernel::Lba StartCatalog; - Kernel::SizeT CatalogCount; + NeOS::Lba StartCatalog; + NeOS::SizeT CatalogCount; - Kernel::SizeT DiskSize; + NeOS::SizeT DiskSize; - Kernel::SizeT FreeCatalog; - Kernel::SizeT FreeSectors; + NeOS::SizeT FreeCatalog; + NeOS::SizeT FreeSectors; - Kernel::SizeT SectorCount; - Kernel::SizeT SectorSize; + NeOS::SizeT SectorCount; + NeOS::SizeT SectorSize; - Kernel::UInt64 Version; + NeOS::UInt64 Version; - Kernel::Lba EpmBlock; + NeOS::Lba EpmBlock; - Kernel::Char Pad[kNeFSPadLen]; + NeOS::Char Pad[kNeFSPadLen]; }; -namespace Kernel +namespace NeOS { class NeFileSystemParser; class NeFileSystemJournal; @@ -440,4 +440,4 @@ namespace Kernel { Boolean fs_init_nefs(Void) noexcept; } // namespace NeFS -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h index 68e401a2..5fe3f4ea 100644 --- a/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h +++ b/dev/Kernel/FirmwareKit/CoreBoot/CoreBoot.h @@ -10,7 +10,7 @@ namespace Firmware::Detail::CoreBoot { - using namespace Kernel; + using namespace NeOS; struct LEHeader; diff --git a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h index 7d539efa..7d3c7920 100644 --- a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h +++ b/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h @@ -11,15 +11,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: ColdChoco - 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 Patch[]; /// non preflight packet has a patch blob for a **PatchTarget** + NeOS::Char PatchName[255]; /// example: ColdChoco + 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 Patch[]; /// non preflight packet has a patch blob for a **PatchTarget** } NetBootInternetHeader; diff --git a/dev/Kernel/FirmwareKit/EFI/EFI.h b/dev/Kernel/FirmwareKit/EFI/EFI.h index 23a20a9f..0806576d 100644 --- a/dev/Kernel/FirmwareKit/EFI/EFI.h +++ b/dev/Kernel/FirmwareKit/EFI/EFI.h @@ -13,7 +13,7 @@ #include <NewKit/Defines.h> -using namespace Kernel; +using namespace NeOS; /* we always use stdcall in EFI, the pascal way of calling functions. */ diff --git a/dev/Kernel/FirmwareKit/EFI/NS.h b/dev/Kernel/FirmwareKit/EFI/NS.h index 4d9decac..18da8aaa 100644 --- a/dev/Kernel/FirmwareKit/EFI/NS.h +++ b/dev/Kernel/FirmwareKit/EFI/NS.h @@ -10,7 +10,7 @@ namespace Firmware::Detail::EFI { - using namespace Kernel; + using namespace NeOS; EXTERN_C { diff --git a/dev/Kernel/FirmwareKit/EPM.h b/dev/Kernel/FirmwareKit/EPM.h index 0cff2e8f..51def6a9 100644 --- a/dev/Kernel/FirmwareKit/EPM.h +++ b/dev/Kernel/FirmwareKit/EPM.h @@ -68,10 +68,10 @@ struct EPM_PART_BLOCK; /// @brief EPM GUID structure. typedef struct EPM_GUID { - Kernel::UInt32 Data1; - Kernel::UInt16 Data2; - Kernel::UInt16 Data3; - Kernel::UInt8 Data4[8]; + NeOS::UInt32 Data1; + NeOS::UInt16 Data2; + NeOS::UInt16 Data3; + NeOS::UInt8 Data4[8]; } EPM_GUID; /** @@ -80,19 +80,19 @@ typedef struct EPM_GUID */ struct PACKED EPM_PART_BLOCK { - Kernel::Char Magic[kEPMMagicLength]; - Kernel::Char Name[kEPMNameLength]; - EPM_GUID Guid; - Kernel::Int32 Version; - Kernel::Int64 NumBlocks; - Kernel::Int64 SectorSz; - Kernel::Int64 LbaStart; // base offset - Kernel::Int64 LbaEnd; // end offset - Kernel::Int16 Kind; - Kernel::Int16 Flags; - Kernel::Int32 FsVersion; - Kernel::Char Fs[kEPMFilesystemLength]; /* NeFS, ffs2... */ - Kernel::Char Reserved[kEPMReserveLen]; // to fill a full sector. + NeOS::Char Magic[kEPMMagicLength]; + NeOS::Char Name[kEPMNameLength]; + EPM_GUID Guid; + NeOS::Int32 Version; + NeOS::Int64 NumBlocks; + NeOS::Int64 SectorSz; + NeOS::Int64 LbaStart; // base offset + NeOS::Int64 LbaEnd; // end offset + NeOS::Int16 Kind; + NeOS::Int16 Flags; + NeOS::Int32 FsVersion; + NeOS::Char Fs[kEPMFilesystemLength]; /* NeFS, ffs2... */ + NeOS::Char Reserved[kEPMReserveLen]; // to fill a full sector. }; ///! @brief Version kind enum. diff --git a/dev/Kernel/FirmwareKit/GPT.h b/dev/Kernel/FirmwareKit/GPT.h index 198b1a17..91838bc7 100644 --- a/dev/Kernel/FirmwareKit/GPT.h +++ b/dev/Kernel/FirmwareKit/GPT.h @@ -11,7 +11,7 @@ #define kSectorSizeGPT (512U) -namespace Kernel +namespace NeOS { struct GPT_GUID; struct GPT_PARTITION_TABLE; @@ -20,10 +20,10 @@ namespace Kernel /// @brief GPT GUID structure. typedef struct GPT_GUID { - Kernel::UInt32 Data1; - Kernel::UInt16 Data2; - Kernel::UInt16 Data3; - Kernel::UInt8 Data4[8]; + NeOS::UInt32 Data1; + NeOS::UInt16 Data2; + NeOS::UInt16 Data3; + NeOS::UInt8 Data4[8]; } GPT_GUID; struct PACKED GPT_PARTITION_TABLE final @@ -54,4 +54,4 @@ namespace Kernel UInt64 Attributes; UInt8 Name[72]; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/FirmwareKit/Handover.h b/dev/Kernel/FirmwareKit/Handover.h index 461eab3a..4ff681ed 100644 --- a/dev/Kernel/FirmwareKit/Handover.h +++ b/dev/Kernel/FirmwareKit/Handover.h @@ -26,7 +26,7 @@ #define kHandoverBitMapSz (gib_cast(4)) #define kHandoverStructSz sizeof(HEL::BootInfoHeader) -namespace Kernel::HEL +namespace NeOS::HEL { /** @brief The executable type enum. @@ -102,7 +102,7 @@ namespace Kernel::HEL /// @brief Alias of bootloader main type. typedef Int32 (*HandoverProc)(BootInfoHeader* boot_info); -} // namespace Kernel::HEL +} // namespace NeOS::HEL /// @brief Bootloader information header global variable. -inline Kernel::HEL::BootInfoHeader* kHandoverHeader = nullptr; +inline NeOS::HEL::BootInfoHeader* kHandoverHeader = nullptr; diff --git a/dev/Kernel/HALKit/AMD64/CPUID.h b/dev/Kernel/HALKit/AMD64/CPUID.h index 59a14330..7f04ac27 100644 --- a/dev/Kernel/HALKit/AMD64/CPUID.h +++ b/dev/Kernel/HALKit/AMD64/CPUID.h @@ -80,7 +80,7 @@ enum CPUFeatureEnum kCPUFeaturePBE = 1 << 31 }; -namespace Kernel +namespace NeOS { typedef Int64 CPUID; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc index 33842d6c..27dfddaa 100644 --- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc @@ -10,7 +10,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/MemoryMgr.h> -namespace Kernel +namespace NeOS { namespace Detail { @@ -123,4 +123,4 @@ namespace Kernel "jmp reset_wait ; " ".att_syntax; "); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalAPICController.cc b/dev/Kernel/HALKit/AMD64/HalAPICController.cc index c3ce5c1a..bd98932f 100644 --- a/dev/Kernel/HALKit/AMD64/HalAPICController.cc +++ b/dev/Kernel/HALKit/AMD64/HalAPICController.cc @@ -10,7 +10,7 @@ #define cIOAPICRegVal (4) #define cIOAPICRegReg (0) -namespace Kernel::HAL +namespace NeOS::HAL { APICController::APICController(VoidPtr base) : fApic(base) @@ -41,4 +41,4 @@ namespace Kernel::HAL io_apic[cIOAPICRegReg] = (reg & 0xFF); io_apic[cIOAPICRegVal] = value; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc index 627f3fcb..c847f2b9 100644 --- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -34,7 +34,7 @@ /////////////////////////////////////////////////////////////////////////////////////// -namespace Kernel::HAL +namespace NeOS::HAL { struct PROCESS_APIC_MADT; struct PROCESS_CONTROL_BLOCK; @@ -120,10 +120,10 @@ namespace Kernel::HAL Void hal_send_start_ipi(UInt32 target, UInt32 apic_id) { - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); - while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { ; } @@ -138,10 +138,10 @@ namespace Kernel::HAL /***********************************************************************************/ Void hal_send_sipi(UInt32 target, UInt32 apic_id, UInt8 vector) { - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector); - while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { NE_UNUSED(0); } @@ -241,7 +241,7 @@ namespace Kernel::HAL hal_send_start_ipi(kApicBaseAddress, kAPICLocales[kSMPCount]); - HardwareTimer timer(Kernel::Milliseconds(10)); + HardwareTimer timer(NeOS::Milliseconds(10)); timer.Wait(); /// TODO: HAL helper to create an address. @@ -268,6 +268,6 @@ namespace Kernel::HAL /// TODO: Notify Boot AP that it must start. } } -} // namespace Kernel::HAL +} // namespace NeOS::HAL /////////////////////////////////////////////////////////////////////////////////////// diff --git a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc index ef1ce21f..3d9c8938 100644 --- a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc @@ -13,11 +13,11 @@ STATIC BOOL kIsScheduling = NO; /// @brief Handle GPF fault. /// @param rsp -EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_gpf(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -30,18 +30,18 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle page fault. /// @param rsp -EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -53,15 +53,15 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) process.Leak().ProcessSignal.SignalID = SIGKILL; process.Leak().ProcessSignal.PreviousStatus = process.Leak().Status; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle scheduler interrupt. -EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp) { - static Kernel::Int64 try_count_before_brute = 100000UL; + static NeOS::Int64 try_count_before_brute = 100000UL; while (kIsScheduling) { @@ -75,18 +75,18 @@ EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) kIsScheduling = YES; kout << "Kernel: Timer IRQ (Scheduler Notification).\r"; - Kernel::UserProcessHelper::StartScheduling(); + NeOS::UserProcessHelper::StartScheduling(); kIsScheduling = NO; } /// @brief Handle math fault. /// @param rsp -EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -99,7 +99,7 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } @@ -108,11 +108,11 @@ EXTERN BOOL kAHCICommandIssued; /// @brief Handle any generic fault. /// @param rsp -EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) { kout << "Getting here.\r"; return; @@ -128,16 +128,16 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } -EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) +EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) { kout << "Kernel: SIGTRAP\r"; @@ -147,7 +147,7 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) kIsScheduling = NO; - kout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << endl; + kout << "Kernel: Process RIP: " << NeOS::hex_number(rip) << endl; kout << "Kernel: SIGTRAP\r"; process.Leak().ProcessSignal.SignalArg = rip; @@ -157,16 +157,16 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) kout << "Kernel: SIGTRAP status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kFrozen; + process.Leak().Status = NeOS::ProcessStatusKind::kFrozen; } /// @brief Handle #UD fault. /// @param rsp -EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -179,7 +179,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } @@ -187,7 +187,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) /// @brief Enter syscall from assembly. /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, Kernel::UIntPtr rdx_syscall_struct) +EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS::UIntPtr rdx_syscall_struct) { if (rcx_syscall_index < kSyscalls.Count()) { @@ -197,7 +197,7 @@ EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, K { if (kSyscalls[rcx_syscall_index].fProc) { - (kSyscalls[rcx_syscall_index].fProc)((Kernel::VoidPtr)rdx_syscall_struct); + (kSyscalls[rcx_syscall_index].fProc)((NeOS::VoidPtr)rdx_syscall_struct); } else { @@ -216,7 +216,7 @@ EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, K /// @brief Enter Kernel call from assembly (DDK only). /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, Kernel::UIntPtr rdx_kerncall_struct) +EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS::UIntPtr rdx_kerncall_struct) { if (rcx_kerncall_index < kKerncalls.Count()) { @@ -226,7 +226,7 @@ EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, { if (kKerncalls[rcx_kerncall_index].fProc) { - (kKerncalls[rcx_kerncall_index].fProc)((Kernel::VoidPtr)rdx_kerncall_struct); + (kKerncalls[rcx_kerncall_index].fProc)((NeOS::VoidPtr)rdx_kerncall_struct); } else { diff --git a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc index a51a1e15..dfdf52f1 100644 --- a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc @@ -11,7 +11,7 @@ #include <Mod/CoreGfx/FBMgr.h> #include <Mod/CoreGfx/TextMgr.h> -namespace Kernel +namespace NeOS { enum CommStatus { @@ -183,8 +183,8 @@ namespace Kernel TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); + TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); return out; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc b/dev/Kernel/HALKit/AMD64/HalDebugPort.cc index 5e6f60a6..f88b1a70 100644 --- a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc +++ b/dev/Kernel/HALKit/AMD64/HalDebugPort.cc @@ -12,7 +12,7 @@ // after that we have start of additional data. -namespace Kernel +namespace NeOS { void rt_debug_listen(DebuggerPortHeader* theHook) noexcept { @@ -37,4 +37,4 @@ namespace Kernel ++theHook->fBoundCnt; } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc b/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc index a83ed2e5..154b11af 100644 --- a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc +++ b/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc @@ -9,11 +9,11 @@ #define kPITDefaultTicks (1000U) -namespace Kernel::HAL +namespace NeOS::HAL { namespace Detail { - STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64 + STATIC ::NeOS::Detail::AMD64::InterruptDescriptorAMD64 kInterruptVectorTable[kKernelIdtSize] = {}; STATIC void hal_set_irq_mask(UInt8 irql); @@ -88,7 +88,7 @@ namespace Kernel::HAL const Int16 kPITTickForScheduler = kPITDefaultTicks; - volatile ::Kernel::UIntPtr** ptr_ivt = (volatile ::Kernel::UIntPtr**)idt.Base; + volatile ::NeOS::UIntPtr** ptr_ivt = (volatile ::NeOS::UIntPtr**)idt.Base; for (SizeT idt_indx = 0; idt_indx < kKernelIdtSize; ++idt_indx) { @@ -104,7 +104,7 @@ namespace Kernel::HAL } idt.Base = (UIntPtr)&Detail::kInterruptVectorTable[0]; - idt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) * + idt.Limit = sizeof(::NeOS::Detail::AMD64::InterruptDescriptorAMD64) * (kKernelIdtSize); hal_load_idt(idt); @@ -123,4 +123,4 @@ namespace Kernel::HAL { IDTLoader::Load(idt.Leak()); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc index a15a6984..bdc09bcf 100644 --- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc @@ -13,35 +13,35 @@ #include <CFKit/Property.h> #include <Mod/CoreGfx/TextMgr.h> -EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; -EXTERN_C Kernel::VoidPtr mp_user_switch_proc; -EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; +EXTERN_C NeOS::VoidPtr kInterruptVectorTable[]; +EXTERN_C NeOS::VoidPtr mp_user_switch_proc; +EXTERN_C NeOS::Char mp_user_switch_proc_stack_begin[]; -EXTERN_C Kernel::rtl_ctor_kind __CTOR_LIST__[]; -EXTERN_C Kernel::VoidPtr __DTOR_LIST__; +EXTERN_C NeOS::rtl_ctor_kind __CTOR_LIST__[]; +EXTERN_C NeOS::VoidPtr __DTOR_LIST__; -EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len); +EXTERN_C NeOS::Void rtl_kernel_main(NeOS::SizeT argc, char** argv, char** envp, NeOS::SizeT envp_len); -STATIC Kernel::Void hal_init_cxx_ctors() +STATIC NeOS::Void hal_init_cxx_ctors() { - for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) + for (NeOS::SizeT i = 0U; i < NeOS::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) { - Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); - Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled; + NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = NeOS::UserProcess(); + NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = NeOS::ProcessStatusKind::kKilled; } - Kernel::UserProcessScheduler::The().CurrentTeam().mProcessCount = 0UL; + NeOS::UserProcessScheduler::The().CurrentTeam().mProcessCount = 0UL; - for (Kernel::SizeT index = 0UL; __CTOR_LIST__[index] != __DTOR_LIST__; ++index) + for (NeOS::SizeT index = 0UL; __CTOR_LIST__[index] != __DTOR_LIST__; ++index) { - Kernel::rtl_ctor_kind constructor_cxx = (Kernel::rtl_ctor_kind)__CTOR_LIST__[index]; + NeOS::rtl_ctor_kind constructor_cxx = (NeOS::rtl_ctor_kind)__CTOR_LIST__[index]; constructor_cxx(); } } /// @brief Kernel init procedure. EXTERN_C void hal_init_platform( - Kernel::HEL::BootInfoHeader* handover_hdr) + NeOS::HEL::BootInfoHeader* handover_hdr) { kHandoverHeader = handover_hdr; @@ -58,8 +58,8 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( - reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( + reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); /************************************** */ /* INITIALIZE GDT AND SEGMENTS. */ @@ -68,7 +68,7 @@ EXTERN_C void hal_init_platform( STATIC CONST auto kGDTEntriesCount = 6; /* GDT, mostly descriptors for user and kernel segments. */ - STATIC Kernel::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { + STATIC NeOS::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { {.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0}, // Null entry {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data @@ -77,31 +77,31 @@ EXTERN_C void hal_init_platform( }; // Load memory descriptors. - Kernel::HAL::RegisterGDT gdt_reg; + NeOS::HAL::RegisterGDT gdt_reg; - gdt_reg.Base = reinterpret_cast<Kernel::UIntPtr>(kGDTArray); - gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; + gdt_reg.Base = reinterpret_cast<NeOS::UIntPtr>(kGDTArray); + gdt_reg.Limit = (sizeof(NeOS::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; FB::fb_clear_video(); //! GDT will load hal_read_init after it successfully loads the segments. - Kernel::HAL::GDTLoader gdt_loader; + NeOS::HAL::GDTLoader gdt_loader; gdt_loader.Load(gdt_reg); - Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP); + NeOS::ke_panic(RUNTIME_CHECK_BOOTSTRAP); } -EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept +EXTERN_C NeOS::Void hal_real_init(NeOS::Void) noexcept { rtl_kernel_main(0, nullptr, nullptr, 0); - Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); + NeOS::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - Kernel::HAL::Register64 idt_reg; + NeOS::HAL::Register64 idt_reg; - idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable; + idt_reg.Base = (NeOS::UIntPtr)kInterruptVectorTable; - Kernel::HAL::IDTLoader idt_loader; + NeOS::HAL::IDTLoader idt_loader; idt_loader.Load(idt_reg); diff --git a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc index 11ed4c04..df060648 100644 --- a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc +++ b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc @@ -18,7 +18,7 @@ /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace Kernel +namespace NeOS { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace Kernel /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const Kernel::Int32& id, const Char* message) + Void ke_panic(const NeOS::Int32& id, const Char* message) { fb_init(); @@ -65,4 +65,4 @@ namespace Kernel ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc index 442e9b83..b5fa2b1d 100644 --- a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc @@ -10,7 +10,7 @@ #include <HALKit/AMD64/Paging.h> #include <HALKit/AMD64/Processor.h> -namespace Kernel::HAL +namespace NeOS::HAL { typedef UInt32 PageTableIndex; @@ -201,4 +201,4 @@ namespace Kernel::HAL return 0; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc b/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc index b3cf8d09..b3da8352 100644 --- a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc @@ -15,7 +15,7 @@ * @brief Common CPU API. */ -namespace Kernel::HAL +namespace NeOS::HAL { Void lrt_out8(UInt16 port, UInt8 value) { @@ -98,4 +98,4 @@ namespace Kernel::HAL { asm volatile("std"); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc b/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc index 6b287060..bf4b9d91 100644 --- a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc @@ -7,7 +7,7 @@ #include <HALKit/AMD64/Processor.h> #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Unimplemented function (crashes by default) @@ -37,7 +37,7 @@ namespace Kernel /// Wakes up thread from the hang state. Void mp_wakeup_thread(HAL::StackFrame* stack) { - Kernel::UserProcessHelper::StartScheduling(); + NeOS::UserProcessHelper::StartScheduling(); } /// @brief makes the thread sleep on a loop. @@ -49,4 +49,4 @@ namespace Kernel /* Nothing to do, code is spinning */ } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc index ffd02eb5..9b3380c3 100644 --- a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc @@ -26,24 +26,24 @@ ///! @file HalTimer.cc
///! @brief Hardware Timer (HPET)
-namespace Kernel::Detail
+namespace NeOS::Detail
{
- struct HPET_BLOCK : public Kernel::SDT
+ struct HPET_BLOCK : public NeOS::SDT
{
- Kernel::UInt8 hardware_rev_id;
- Kernel::UInt8 comparator_count : 5;
- Kernel::UInt8 counter_size : 1;
- Kernel::UInt8 reserved : 1;
- Kernel::UInt8 legacy_replacement : 1;
- Kernel::UInt16 pci_vendor_id;
- ACPI_ADDRESS address;
- Kernel::UInt8 hpet_number;
- Kernel::UInt16 minimum_tick;
- Kernel::UInt8 page_protection;
+ NeOS::UInt8 hardware_rev_id;
+ NeOS::UInt8 comparator_count : 5;
+ NeOS::UInt8 counter_size : 1;
+ NeOS::UInt8 reserved : 1;
+ NeOS::UInt8 legacy_replacement : 1;
+ NeOS::UInt16 pci_vendor_id;
+ ACPI_ADDRESS address;
+ NeOS::UInt8 hpet_number;
+ NeOS::UInt16 minimum_tick;
+ NeOS::UInt8 page_protection;
} PACKED;
-} // namespace Kernel::Detail
+} // namespace NeOS::Detail
-using namespace Kernel;
+using namespace NeOS;
HardwareTimer::HardwareTimer(Int64 ms)
: fWaitFor(ms)
diff --git a/dev/Kernel/HALKit/AMD64/Hypervisor.h b/dev/Kernel/HALKit/AMD64/Hypervisor.h index 05539c06..4c226eee 100644 --- a/dev/Kernel/HALKit/AMD64/Hypervisor.h +++ b/dev/Kernel/HALKit/AMD64/Hypervisor.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { MAKE_STRING_ENUM(HYPERVISOR) ENUM_STRING(Qemu, "TCGTCGTCGTCG"); @@ -22,4 +22,4 @@ namespace Kernel ENUM_STRING(Bhyve, "bhyve bhyve "); ENUM_STRING(Qnx, " QNXQVMBSQG "); END_STRING_ENUM() -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc index e9981315..fef5ec8d 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc @@ -6,7 +6,7 @@ #include <KernelKit/PCI/DMA.h> -namespace Kernel +namespace NeOS { DMAWrapper::operator bool() { @@ -80,4 +80,4 @@ namespace Kernel fAddress = Ptr; return *this; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/PCI/Database.cc b/dev/Kernel/HALKit/AMD64/PCI/Database.cc index 17bbfe57..c5aa1282 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Database.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Database.cc @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Database.h> -namespace Kernel +namespace NeOS { } diff --git a/dev/Kernel/HALKit/AMD64/PCI/Device.cc b/dev/Kernel/HALKit/AMD64/PCI/Device.cc index 02d94163..576fe026 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Device.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Device.cc @@ -7,30 +7,30 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/PCI/Device.h> -Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) +NeOS::UInt NE_PCIReadRaw(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) { - Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | + ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + (bar & 0xFC); - Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + target); - Kernel::HAL::rt_wait_400ns(); + NeOS::HAL::rt_wait_400ns(); - return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); + return NeOS::HAL::rt_in32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigData); } -void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) +void NE_PCISetCfgTarget(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) { - Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | + ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + (bar & 0xFC); - Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + target); - Kernel::HAL::rt_wait_400ns(); + NeOS::HAL::rt_wait_400ns(); } #define PCI_BAR_IO 0x01 @@ -38,7 +38,7 @@ void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev #define PCI_BAR_64 0x04 #define PCI_BAR_PREFETCH 0x08 -namespace Kernel::PCI +namespace NeOS::PCI { Device::Device(UShort bus, UShort device, UShort func, UInt32 bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -168,4 +168,4 @@ namespace Kernel::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/HALKit/AMD64/PCI/Express.cc b/dev/Kernel/HALKit/AMD64/PCI/Express.cc index 341d2e69..487cbd39 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Express.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Express.cc @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Express.h> -namespace Kernel +namespace NeOS { } diff --git a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc index de5564dd..9758e021 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc @@ -6,7 +6,7 @@ #include <KernelKit/PCI/Iterator.h> -namespace Kernel::PCI +namespace NeOS::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -36,4 +36,4 @@ namespace Kernel::PCI { return fDevices[at]; } -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/HALKit/AMD64/Paging.h b/dev/Kernel/HALKit/AMD64/Paging.h index fbac9bd1..4e2ac1b1 100644 --- a/dev/Kernel/HALKit/AMD64/Paging.h +++ b/dev/Kernel/HALKit/AMD64/Paging.h @@ -31,15 +31,15 @@ #endif // !kAlign EXTERN_C void hal_flush_tlb(); -EXTERN_C void hal_invl_tlb(Kernel::VoidPtr addr); -EXTERN_C void hal_write_cr3(Kernel::VoidPtr cr3); -EXTERN_C void hal_write_cr0(Kernel::VoidPtr bit); +EXTERN_C void hal_invl_tlb(NeOS::VoidPtr addr); +EXTERN_C void hal_write_cr3(NeOS::VoidPtr cr3); +EXTERN_C void hal_write_cr0(NeOS::VoidPtr bit); -EXTERN_C Kernel::VoidPtr hal_read_cr0(); // @brief CPU control register. -EXTERN_C Kernel::VoidPtr hal_read_cr2(); // @brief Fault address. -EXTERN_C Kernel::VoidPtr hal_read_cr3(); // @brief Page table. +EXTERN_C NeOS::VoidPtr hal_read_cr0(); // @brief CPU control register. +EXTERN_C NeOS::VoidPtr hal_read_cr2(); // @brief Fault address. +EXTERN_C NeOS::VoidPtr hal_read_cr3(); // @brief Page table. -namespace Kernel::HAL +namespace NeOS::HAL { /// @brief Final page entry (Not PML, PDPT) struct PACKED NE_PTE final @@ -90,10 +90,10 @@ namespace Kernel::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace Kernel::HAL +} // namespace NeOS::HAL -namespace Kernel +namespace NeOS { typedef HAL::NE_PTE PTE; typedef HAL::NE_PDE PDE; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/Processor.h b/dev/Kernel/HALKit/AMD64/Processor.h index db91d138..1395f03b 100644 --- a/dev/Kernel/HALKit/AMD64/Processor.h +++ b/dev/Kernel/HALKit/AMD64/Processor.h @@ -49,7 +49,7 @@ EXTERN_C #define kTaskGate (0b10001100) #define kIDTSelector (0x08) -namespace Kernel +namespace NeOS { namespace Detail::AMD64 { @@ -64,9 +64,9 @@ namespace Kernel UInt32 Zero; // reserved }; } // namespace Detail::AMD64 -} // namespace Kernel +} // namespace NeOS -namespace Kernel::HAL +namespace NeOS::HAL { /// @brief Memory Manager mapping flags. enum @@ -312,15 +312,15 @@ namespace Kernel::HAL EXTERN_C Void rt_sti(); EXTERN_C Void rt_cld(); EXTERN_C Void rt_std(); -} // namespace Kernel::HAL +} // namespace NeOS::HAL -EXTERN_C Kernel::Void idt_handle_generic(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_gpf(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_math(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_pf(Kernel::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_generic(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_gpf(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_math(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_pf(NeOS::UIntPtr rsp); -EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_idt(Kernel::HAL::Register64 ptr); -EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_gdt(Kernel::HAL::RegisterGDT ptr); +EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_idt(NeOS::HAL::Register64 ptr); +EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_gdt(NeOS::HAL::RegisterGDT ptr); -inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline NeOS::VoidPtr kKernelBitMpStart = nullptr; +inline NeOS::UIntPtr kKernelBitMpSize = 0UL; diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index 2dc17deb..5bc960e0 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -46,38 +46,38 @@ enum kSATABar5 = 0x24, }; -STATIC Kernel::PCI::Device kPCIDevice; -STATIC HbaMem* kSATA = nullptr; -STATIC Kernel::SizeT kSATAPortIdx = 0UL; -STATIC Kernel::Lba kCurrentDiskSectorCount = 0UL; +STATIC NeOS::PCI::Device kPCIDevice; +STATIC HbaMem* kSATA = nullptr; +STATIC NeOS::SizeT kSATAPortIdx = 0UL; +STATIC NeOS::Lba kCurrentDiskSectorCount = 0UL; template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> -static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) noexcept; +static NeOS::Void drv_std_input_output(NeOS::UInt64 lba, NeOS::UInt8* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) noexcept; -static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept; +static NeOS::Int32 drv_find_cmd_slot(HbaPort* port) noexcept; -static Kernel::Void drv_calculate_disk_geometry() noexcept; +static NeOS::Void drv_calculate_disk_geometry() noexcept; -static Kernel::Void drv_calculate_disk_geometry() noexcept +static NeOS::Void drv_calculate_disk_geometry() noexcept { kCurrentDiskSectorCount = 0UL; - Kernel::UInt8 identify_data[kib_cast(4)] = {0}; + NeOS::UInt8 identify_data[kib_cast(4)] = {0}; drv_std_input_output<NO, YES, YES>(0, identify_data, 0, kib_cast(8)); kCurrentDiskSectorCount = (identify_data[61] << 16) | identify_data[60]; - kout << "Disk Size: " << Kernel::number(drv_get_size()) << endl; - kout << "Highest LBA: " << Kernel::number(kCurrentDiskSectorCount) << endl; + kout << "Disk Size: " << NeOS::number(drv_get_size()) << endl; + kout << "Highest LBA: " << NeOS::number(kCurrentDiskSectorCount) << endl; } /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of kSATA that have been detected. /// @return if the disk was successfully initialized or not. -Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) +NeOS::Boolean drv_std_init(NeOS::UInt16& PortsImplemented) { - using namespace Kernel; + using namespace NeOS; PCI::Iterator iterator(Types::PciDeviceKind::MassStorageController); @@ -94,22 +94,22 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) HbaMem* mem_ahci = (HbaMem*)kPCIDevice.Bar(0x24); - Kernel::UInt32 ports_implemented = mem_ahci->Pi; - Kernel::UInt16 ahci_index = 0; + NeOS::UInt32 ports_implemented = mem_ahci->Pi; + NeOS::UInt16 ahci_index = 0; - const Kernel::UInt16 kMaxPortsImplemented = kAhciPortCnt; - const Kernel::UInt32 kSATASignature = 0x00000101; - const Kernel::UInt8 kAhciPresent = 0x03; - const Kernel::UInt8 kAhciIPMActive = 0x01; + const NeOS::UInt16 kMaxPortsImplemented = kAhciPortCnt; + const NeOS::UInt32 kSATASignature = 0x00000101; + const NeOS::UInt8 kAhciPresent = 0x03; + const NeOS::UInt8 kAhciIPMActive = 0x01; - Kernel::Boolean detected = false; + NeOS::Boolean detected = false; while (ahci_index < kMaxPortsImplemented) { if (ports_implemented) { - Kernel::UInt8 ipm = (mem_ahci->Ports[ahci_index].Ssts >> 8) & 0x0F; - Kernel::UInt8 det = mem_ahci->Ports[ahci_index].Ssts & 0x0F; + NeOS::UInt8 ipm = (mem_ahci->Ports[ahci_index].Ssts >> 8) & 0x0F; + NeOS::UInt8 det = mem_ahci->Ports[ahci_index].Ssts & 0x0F; if (mem_ahci->Ports[ahci_index].Sig == kSATASignature && det == kAhciPresent && ipm == kAhciIPMActive) { @@ -137,29 +137,29 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) return No; } -Kernel::Boolean drv_std_detected(Kernel::Void) +NeOS::Boolean drv_std_detected(NeOS::Void) { - return kPCIDevice.DeviceId() != (Kernel::UShort)Kernel::PCI::PciConfigKind::Invalid; + return kPCIDevice.DeviceId() != (NeOS::UShort)NeOS::PCI::PciConfigKind::Invalid; } -Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) +NeOS::Void drv_std_write(NeOS::UInt64 lba, NeOS::Char* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) { - drv_std_input_output<YES, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer); + drv_std_input_output<YES, YES, NO>(lba, (NeOS::UInt8*)buffer, sector_sz, size_buffer); } -Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) +NeOS::Void drv_std_read(NeOS::UInt64 lba, NeOS::Char* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) { - drv_std_input_output<NO, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer); + drv_std_input_output<NO, YES, NO>(lba, (NeOS::UInt8*)buffer, sector_sz, size_buffer); } -static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept +static NeOS::Int32 drv_find_cmd_slot(HbaPort* port) noexcept { if (port == nullptr) return -1; - Kernel::UInt32 slots = (kSATA->Ports[kSATAPortIdx].Sact | kSATA->Ports[kSATAPortIdx].Ci); + NeOS::UInt32 slots = (kSATA->Ports[kSATAPortIdx].Sact | kSATA->Ports[kSATAPortIdx].Ci); - for (Kernel::Int32 i = 0; i < kAhciPortCnt; ++i) + for (NeOS::Int32 i = 0; i < kAhciPortCnt; ++i) { if ((slots & 1) == 0) return i; @@ -173,7 +173,7 @@ static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept BOOL kAHCICommandIssued = NO; template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> -static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) noexcept +static NeOS::Void drv_std_input_output(NeOS::UInt64 lba, NeOS::UInt8* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) noexcept { kSATA->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdFre; kSATA->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdST; @@ -185,33 +185,33 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff if (slot == -1) return; - volatile HbaCmdHeader* command_header = ((volatile HbaCmdHeader*)((Kernel::UInt64)kSATA->Ports[kSATAPortIdx].Clb)); + volatile HbaCmdHeader* command_header = ((volatile HbaCmdHeader*)((NeOS::UInt64)kSATA->Ports[kSATAPortIdx].Clb)); command_header += slot; MUST_PASS(command_header); - command_header->Cfl = sizeof(FisRegH2D) / sizeof(Kernel::UInt32); + command_header->Cfl = sizeof(FisRegH2D) / sizeof(NeOS::UInt32); command_header->Write = Write; command_header->Prdtl = 2; - volatile HbaCmdTbl* command_table = (volatile HbaCmdTbl*)((Kernel::UInt64)command_header->Ctba); + volatile HbaCmdTbl* command_table = (volatile HbaCmdTbl*)((NeOS::UInt64)command_header->Ctba); MUST_PASS(command_table); - auto buffer_phys = Kernel::HAL::hal_get_phys_address(buffer); + auto buffer_phys = NeOS::HAL::hal_get_phys_address(buffer); - command_table->Prdt[0].Dba = ((Kernel::UInt32)(Kernel::UInt64)buffer_phys); - command_table->Prdt[0].Dbau = (((Kernel::UInt64)(buffer_phys) >> 32)); + command_table->Prdt[0].Dba = ((NeOS::UInt32)(NeOS::UInt64)buffer_phys); + command_table->Prdt[0].Dbau = (((NeOS::UInt64)(buffer_phys) >> 32)); command_table->Prdt[0].Dbc = ((size_buffer / 2) - 1); command_table->Prdt[0].Ie = YES; - command_table->Prdt[1].Dba = ((Kernel::UInt32)(Kernel::UInt64)(buffer_phys + ((size_buffer / 2) - 1))); - command_table->Prdt[1].Dbau = (((Kernel::UInt64)(buffer_phys + ((size_buffer / 2) - 1)) >> 32)); + command_table->Prdt[1].Dba = ((NeOS::UInt32)(NeOS::UInt64)(buffer_phys + ((size_buffer / 2) - 1))); + command_table->Prdt[1].Dbau = (((NeOS::UInt64)(buffer_phys + ((size_buffer / 2) - 1)) >> 32)); command_table->Prdt[1].Dbc = ((size_buffer / 2) - 1); command_table->Prdt[1].Ie = YES; - volatile FisRegH2D* h2d_fis = (volatile FisRegH2D*)((Kernel::UInt64)&command_table->Cfis); + volatile FisRegH2D* h2d_fis = (volatile FisRegH2D*)((NeOS::UInt64)&command_table->Cfis); h2d_fis->FisType = kFISTypeRegH2D; h2d_fis->CmdOrCtrl = CommandOrCTRL; @@ -245,7 +245,7 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff { if (kSATA->Is & kHBAErrTaskFile) // check for task file error. { - Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); + NeOS::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); } } @@ -254,7 +254,7 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff if (kSATA->Is & kHBAErrTaskFile) // check for task file error. { - Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); + NeOS::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); } } @@ -262,14 +262,14 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff @brief Gets the number of sectors inside the drive. @return Sector size in bytes. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return kCurrentDiskSectorCount; } /// @brief Get the drive size. /// @return Disk size in bytes. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return drv_get_sector_count() * kAHCISectorSize; } diff --git a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc index 646af906..eafd86fa 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc @@ -23,16 +23,16 @@ #define kATADataLen 256 -using namespace Kernel; -using namespace Kernel::HAL; +using namespace NeOS; +using namespace NeOS::HAL; /// BUGS: 0 STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; -STATIC Kernel::PCI::Device kATADevice; -STATIC Char kCurrentDiskModel[50] = {"UNKNOWN ATA DRIVE"}; +STATIC NeOS::PCI::Device kATADevice; +STATIC Char kCurrentDiskModel[50] = {"UNKNOWN ATA DRIVE"}; Boolean drv_std_wait_io(UInt16 IO) { @@ -105,7 +105,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) for (SizeT i = 0ul; i < kATADataLen; ++i) { drv_std_wait_io(IO); - kATAData[i] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + kATAData[i] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); drv_std_wait_io(IO); } @@ -133,7 +133,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) namespace Details { - using namespace Kernel; + using namespace NeOS; struct PRD final { @@ -238,13 +238,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/Kernel/HALKit/AMD64/Storage/PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/PIO.cc index 0b19b373..2563738a 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/PIO.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/PIO.cc @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace Kernel; -using namespace Kernel::HAL; +using namespace NeOS; +using namespace NeOS::HAL; /// bugs: 0 @@ -96,10 +96,10 @@ ATAInit_Retry: for (SizeT i = 0ul; i < kATADataLen; ++i) { - kATAData[i] = Kernel::HAL::rt_in16(OutBus + ATA_REG_DATA); + kATAData[i] = NeOS::HAL::rt_in16(OutBus + ATA_REG_DATA); } - for (Kernel::Int32 i = 0; i < 20; i++) + for (NeOS::Int32 i = 0; i < 20; i++) { kCurrentDiskModel[i * 2] = kATAData[27 + i] >> 8; kCurrentDiskModel[i * 2 + 1] = kATAData[27 + i + 1] & 0xFF; @@ -135,7 +135,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) { drv_std_wait_io(IO); - Buf[IndexOff] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + Buf[IndexOff] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); } } @@ -175,13 +175,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc b/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc index 2ed2444d..a3366da4 100644 --- a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc +++ b/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc @@ -7,7 +7,7 @@ #include <Mod/APM/APM.h> #include <KernelKit/LPC.h> -using namespace Kernel; +using namespace NeOS; /// @brief Send APM command to it's space. /// @param base_dma the IO base port. diff --git a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h b/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h index e987cf81..d263f9b8 100644 --- a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h +++ b/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h @@ -13,7 +13,7 @@ /* INITIALIZE THE GIC ON CPU. */ /************************************************** */ -namespace Kernel +namespace NeOS { - BOOL mp_initialize_gic(Kernel::Void); + BOOL mp_initialize_gic(NeOS::Void); }
\ No newline at end of file diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc index dd62d439..6dcfa9a2 100644 --- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc @@ -10,7 +10,7 @@ #include <KernelKit/MemoryMgr.h> #include <Mod/APM/APM.h> -namespace Kernel +namespace NeOS { ACPIFactoryInterface::ACPIFactoryInterface(VoidPtr rsp_ptr) : fRsdp(rsp_ptr), fEntries(0) @@ -28,4 +28,4 @@ namespace Kernel { apm_send_io_command(kAPMPowerCommandReboot, 0); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc index c2bea7e3..415ad5b1 100644 --- a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc +++ b/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc @@ -28,7 +28,7 @@ // ================================================================= //
-namespace Kernel
+namespace NeOS
{
struct PROCESS_CONTROL_BLOCK final
{
@@ -133,4 +133,4 @@ namespace Kernel return NO;
}
-} // namespace Kernel
\ No newline at end of file +} // namespace NeOS
\ No newline at end of file diff --git a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc b/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc index ae3c0e44..65a7e79a 100644 --- a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc @@ -9,7 +9,7 @@ #include <NewKit/Utils.h> #include <NewKit/New.h> -namespace Kernel +namespace NeOS { EXTERN_C void ke_io_write(const Char* bytes) { @@ -76,8 +76,8 @@ namespace Kernel TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); + TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); return out; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc index 40089c2d..afb1cc0e 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc @@ -19,7 +19,7 @@ #include <CFKit/Property.h> EXTERN_C void hal_init_platform( - Kernel::HEL::BootInfoHeader* handover_hdr) + NeOS::HEL::BootInfoHeader* handover_hdr) { /************************************************** */ @@ -39,12 +39,12 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( - reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( + reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); /// @note do initialize the interrupts after it. - Kernel::mp_initialize_gic(); + NeOS::mp_initialize_gic(); while (YES) { diff --git a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc b/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc index d7884682..cdf6e1b1 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc @@ -18,7 +18,7 @@ /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace Kernel +namespace NeOS { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace Kernel /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const Kernel::Int32& id, const Char* message) + Void ke_panic(const NeOS::Int32& id, const Char* message) { fb_init(); @@ -77,4 +77,4 @@ namespace Kernel ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc index b565409f..e04b77cd 100644 --- a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc @@ -10,7 +10,7 @@ #include <HALKit/ARM64/Paging.h> #include <HALKit/ARM64/Processor.h> -namespace Kernel::HAL +namespace NeOS::HAL { typedef UInt32 PageTableIndex; @@ -83,4 +83,4 @@ namespace Kernel::HAL return 0; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc index 629e4eca..55c8aab5 100644 --- a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc @@ -6,7 +6,7 @@ #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /// @brief Wakes up thread. /// Wakes up thread from the hang state. @@ -21,4 +21,4 @@ namespace Kernel { NE_UNUSED(stack); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc index 00a11fac..3a9b7074 100644 --- a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc @@ -7,7 +7,7 @@ #include <HALKit/ARM64/Processor.h>
#include <KernelKit/UserProcessScheduler.h>
-namespace Kernel
+namespace NeOS
{
/***********************************************************************************/
/// @brief Unimplemented function (crashes by default)
@@ -32,4 +32,4 @@ namespace Kernel return stack_ptr->SP != 0 && stack_ptr->BP != 0;
}
-} // namespace Kernel
+} // namespace NeOS
diff --git a/dev/Kernel/HALKit/ARM64/Paging.h b/dev/Kernel/HALKit/ARM64/Paging.h index c27b982b..3c24f757 100644 --- a/dev/Kernel/HALKit/ARM64/Paging.h +++ b/dev/Kernel/HALKit/ARM64/Paging.h @@ -56,7 +56,7 @@ M, N \ } -namespace Kernel::HAL +namespace NeOS::HAL { struct PACKED PTE_4KB final { @@ -109,12 +109,12 @@ namespace Kernel::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace Kernel::HAL +} // namespace NeOS::HAL -namespace Kernel +namespace NeOS { typedef HAL::PTE_4KB PTE; typedef HAL::PDE_4KB PDE; -} // namespace Kernel +} // namespace NeOS EXTERN_C void hal_flush_tlb(); diff --git a/dev/Kernel/HALKit/ARM64/Processor.h b/dev/Kernel/HALKit/ARM64/Processor.h index 023b6bfb..4dba5a8b 100644 --- a/dev/Kernel/HALKit/ARM64/Processor.h +++ b/dev/Kernel/HALKit/ARM64/Processor.h @@ -13,7 +13,7 @@ #define kCPUBackendName "ARMv8" -namespace Kernel::HAL +namespace NeOS::HAL { struct PACKED Register64 final { @@ -81,11 +81,11 @@ namespace Kernel::HAL { asm volatile("wfi"); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL -inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline NeOS::VoidPtr kKernelBitMpStart = nullptr; +inline NeOS::UIntPtr kKernelBitMpSize = 0UL; -inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; +inline NeOS::VoidPtr kKernelPhysicalStart = nullptr; #include <HALKit/ARM64/Paging.h> diff --git a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc index f5553f3e..18071fea 100644 --- a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc +++ b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc @@ -16,7 +16,7 @@ #define kMaxFlashSlots (8U) -namespace Kernel +namespace NeOS { /// /Mount/Flash/n constexpr auto kFlashBridgeMagic = "FLSH"; @@ -79,6 +79,6 @@ namespace Kernel return YES; } -} // namespace Kernel +} // namespace NeOS #endif // if NE_USE_MBCI_FLASH diff --git a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp index 233bc5e0..f77186fd 100644 --- a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp +++ b/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp @@ -10,7 +10,7 @@ /// @brief Internal call for syscall, to work with C++. /// @param stack /// @return nothing. -EXTERN_C void rt_syscall_handle(Kernel::HAL::StackFrame* stack) +EXTERN_C void rt_syscall_handle(NeOS::HAL::StackFrame* stack) { if (stack->Rcx <= (kSyscalls.Count() - 1)) { diff --git a/dev/Kernel/HALKit/POWER/AP.h b/dev/Kernel/HALKit/POWER/AP.h index 12ba467c..e0ef3ffb 100644 --- a/dev/Kernel/HALKit/POWER/AP.h +++ b/dev/Kernel/HALKit/POWER/AP.h @@ -15,25 +15,25 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { struct HAL_HARDWARE_THREAD; /// @brief hardware thread indentification type. - typedef Kernel::Int32 hal_ap_kind; + typedef NeOS::Int32 hal_ap_kind; /// @brief Hardware thread information structure. typedef struct HAL_HARDWARE_THREAD { - Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + NeOS::UIntPtr fStartAddress; + NeOS::UInt8 fPrivleged : 1; + NeOS::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); -} // namespace Kernel + EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); +} // namespace NeOS diff --git a/dev/Kernel/HALKit/POWER/HalAP.cc b/dev/Kernel/HALKit/POWER/HalAP.cc index 00112702..32f91a5f 100644 --- a/dev/Kernel/HALKit/POWER/HalAP.cc +++ b/dev/Kernel/HALKit/POWER/HalAP.cc @@ -8,16 +8,16 @@ #include <KernelKit/DebugOutput.h> #include <HALKit/POWER/AP.h> -using namespace Kernel; +using namespace NeOS; -namespace Kernel::Detail +namespace NeOS::Detail { STATIC void mp_hang_fn(void) { while (YES) ; } -} // namespace Kernel::Detail +} // namespace NeOS::Detail /// @brief wakes up thread. /// wakes up thread from hang. @@ -36,5 +36,5 @@ void mp_hang_thread(HAL::StackFramePtr stack) if (!stack) return; - hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn)); + hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(NeOS::Detail::mp_hang_fn)); } diff --git a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc b/dev/Kernel/HALKit/POWER/HalDebugOutput.cc index 6d28a877..4362de40 100644 --- a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/POWER/HalDebugOutput.cc @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.h> #include <KernelKit/DebugOutput.h> -using namespace Kernel; +using namespace NeOS; /// @brief Writes to COM1. /// @param bytes diff --git a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc b/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc index 3d56f2ac..d3d4b694 100644 --- a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc +++ b/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc @@ -10,7 +10,7 @@ /// @note Refer to SoC documentation. -using namespace Kernel; +using namespace NeOS; EXTERN_C Void hal_write_tlb(UInt32 mas0, UInt32 mas1, UInt32 mas2, UInt32 mas3, UInt32 mas7) { diff --git a/dev/Kernel/HALKit/POWER/Processor.h b/dev/Kernel/HALKit/POWER/Processor.h index 6db4e3cd..bbcfd01f 100644 --- a/dev/Kernel/HALKit/POWER/Processor.h +++ b/dev/Kernel/HALKit/POWER/Processor.h @@ -14,7 +14,7 @@ #define NoOp() asm volatile("mr 0, 0") #define kHalPPCAlignment __attribute__((aligned(4))) -namespace Kernel::HAL +namespace NeOS::HAL { typedef UIntPtr Reg; @@ -47,16 +47,16 @@ namespace Kernel::HAL { NoOp(); // no oop } -} // namespace Kernel::HAL +} // namespace NeOS::HAL -EXTERN_C Kernel::Void int_handle_math(Kernel::UIntPtr sp); -EXTERN_C Kernel::Void int_handle_pf(Kernel::UIntPtr sp); +EXTERN_C NeOS::Void int_handle_math(NeOS::UIntPtr sp); +EXTERN_C NeOS::Void int_handle_pf(NeOS::UIntPtr sp); /// @brief Set TLB. -Kernel::Bool hal_set_tlb(Kernel::UInt8 tlb, Kernel::UInt32 epn, Kernel::UInt64 rpn, Kernel::UInt8 perms, Kernel::UInt8 wimge, Kernel::UInt8 ts, Kernel::UInt8 esel, Kernel::UInt8 tsize, Kernel::UInt8 iprot); +NeOS::Bool hal_set_tlb(NeOS::UInt8 tlb, NeOS::UInt32 epn, NeOS::UInt64 rpn, NeOS::UInt8 perms, NeOS::UInt8 wimge, NeOS::UInt8 ts, NeOS::UInt8 esel, NeOS::UInt8 tsize, NeOS::UInt8 iprot); /// @brief Write TLB. -Kernel::Void hal_write_tlb(Kernel::UInt32 mas0, Kernel::UInt32 mas1, Kernel::UInt32 mas2, Kernel::UInt32 mas3, Kernel::UInt32 mas7); +NeOS::Void hal_write_tlb(NeOS::UInt32 mas0, NeOS::UInt32 mas1, NeOS::UInt32 mas2, NeOS::UInt32 mas3, NeOS::UInt32 mas7); /// @brief Flush TLB. -EXTERN_C Kernel::Void hal_flush_tlb(); +EXTERN_C NeOS::Void hal_flush_tlb(); diff --git a/dev/Kernel/HALKit/RISCV/AP.h b/dev/Kernel/HALKit/RISCV/AP.h index 427c8e90..258a7b5c 100644 --- a/dev/Kernel/HALKit/RISCV/AP.h +++ b/dev/Kernel/HALKit/RISCV/AP.h @@ -15,22 +15,22 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { typedef Int64 hal_ap_kind; typedef struct HAL_HARDWARE_THREAD { - Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + NeOS::UIntPtr fStartAddress; + NeOS::UInt8 fPrivleged : 1; + NeOS::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); + EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/RISCV/HalAP.cc b/dev/Kernel/HALKit/RISCV/HalAP.cc index c271f011..788acf0f 100644 --- a/dev/Kernel/HALKit/RISCV/HalAP.cc +++ b/dev/Kernel/HALKit/RISCV/HalAP.cc @@ -8,16 +8,16 @@ #include <KernelKit/DebugOutput.h>
#include <HALKit/RISCV/AP.h>
-using namespace Kernel;
+using namespace NeOS;
-namespace Kernel::Detail
+namespace NeOS::Detail
{
STATIC void mp_hang_fn(void)
{
while (YES)
;
}
-} // namespace Kernel::Detail
+} // namespace NeOS::Detail
/// @brief wakes up thread.
/// wakes up thread from hang.
@@ -36,5 +36,5 @@ void mp_hang_thread(HAL::StackFramePtr stack) if (!stack)
return;
- hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn));
+ hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(NeOS::Detail::mp_hang_fn));
}
diff --git a/dev/Kernel/KernelKit/CodeMgr.h b/dev/Kernel/KernelKit/CodeMgr.h index 15ec420e..5f83c74b 100644 --- a/dev/Kernel/KernelKit/CodeMgr.h +++ b/dev/Kernel/KernelKit/CodeMgr.h @@ -18,7 +18,7 @@ #include <KernelKit/PEFCodeMgr.h> #include <KernelKit/IPEFDylibObject.h> -namespace Kernel +namespace NeOS { /// @brief Main process entrypoint. typedef void (*rtl_main_kind)(const SizeT argc, Char** argv, Char** envp, const SizeT envp_len); @@ -34,4 +34,4 @@ namespace Kernel /// @param main the start of the process. /// @return The team's process id. ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h index f57575ac..498b2b6b 100644 --- a/dev/Kernel/KernelKit/DebugOutput.h +++ b/dev/Kernel/KernelKit/DebugOutput.h @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace Kernel +namespace NeOS { class TerminalDevice; class DTraceDevice; @@ -200,12 +200,12 @@ namespace Kernel number(number, src); return src; } -} // namespace Kernel +} // namespace NeOS #ifdef kout #undef kout #endif // ifdef kout -#define kout Kernel::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " +#define kout NeOS::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " -#define endl Kernel::TerminalDevice::The() << Kernel::end_line() +#define endl NeOS::TerminalDevice::The() << NeOS::end_line() diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/Kernel/KernelKit/DeviceMgr.h index 6059f4b8..34ca2957 100644 --- a/dev/Kernel/KernelKit/DeviceMgr.h +++ b/dev/Kernel/KernelKit/DeviceMgr.h @@ -24,11 +24,11 @@ #define kDeviceMgrRootDirPath "/Devices/" -#define NE_DEVICE : public ::Kernel::IDeviceObject +#define NE_DEVICE : public ::NeOS::IDeviceObject // Last Rev: Wed, Apr 3, 2024 9:09:41 AM -namespace Kernel +namespace NeOS { template <typename T> class IDeviceObject; @@ -137,4 +137,4 @@ namespace Kernel kDeviceTypeMediaCtrl, // MM controller kDeviceTypeCount, }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/Kernel/KernelKit/DriveMgr.h index 997db1f9..f5699dcb 100644 --- a/dev/Kernel/KernelKit/DriveMgr.h +++ b/dev/Kernel/KernelKit/DriveMgr.h @@ -23,7 +23,7 @@ #define drv_sector_cnt(SIZE, SECTOR_SZ) (((SIZE) + (SECTOR_SZ)) / (SECTOR_SZ)) -namespace Kernel +namespace NeOS { enum { @@ -186,6 +186,6 @@ namespace Kernel /// @param DrvIndex drive index. /// @return Int32 fs_ifs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex); -} // namespace Kernel +} // namespace NeOS #endif /* ifndef INC_DRIVE_MANAGER_H */ diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h index 40cf7c46..543a9ae4 100644 --- a/dev/Kernel/KernelKit/FileMgr.h +++ b/dev/Kernel/KernelKit/FileMgr.h @@ -49,7 +49,7 @@ #define kRestrictMax (5U) -#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<NeOS::NodePtr>(PTR) /** @note Refer to first enum. @@ -60,7 +60,7 @@ /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -namespace Kernel +namespace NeOS { enum { @@ -387,6 +387,6 @@ namespace Kernel { mm_delete_heap(fFile); } -} // namespace Kernel +} // namespace NeOS #endif // ifndef INC_FILEMGR_H diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/Kernel/KernelKit/HardwareThreadScheduler.h index 3615d570..e620d3a4 100644 --- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h +++ b/dev/Kernel/KernelKit/HardwareThreadScheduler.h @@ -16,7 +16,7 @@ #define kMaxAPInsideSched (8U) -namespace Kernel +namespace NeOS { class HardwareThread; class HardwareThreadScheduler; @@ -144,6 +144,6 @@ namespace Kernel /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void mp_hang_thread(HAL::StackFramePtr stack); -} // namespace Kernel +} // namespace NeOS #endif // !__INC_MP_MANAGER_H__ diff --git a/dev/Kernel/KernelKit/IDylibObject.h b/dev/Kernel/KernelKit/IDylibObject.h index ed1d58a6..2c70e6c7 100644 --- a/dev/Kernel/KernelKit/IDylibObject.h +++ b/dev/Kernel/KernelKit/IDylibObject.h @@ -14,7 +14,7 @@ #define NE_DLL_OBJECT : public IDylibObject -namespace Kernel +namespace NeOS { /// @brief DLL class object. A handle to a shared library. class IDylibObject @@ -45,4 +45,4 @@ namespace Kernel /// @brief Pure implementation, missing method/function handler. EXTERN_C void __zka_pure_call(void); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/Kernel/KernelKit/IPEFDylibObject.h index 0f241b80..8be424c0 100644 --- a/dev/Kernel/KernelKit/IPEFDylibObject.h +++ b/dev/Kernel/KernelKit/IPEFDylibObject.h @@ -16,7 +16,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/IDylibObject.h> -namespace Kernel +namespace NeOS { /** * @brief Shared Library class @@ -101,6 +101,6 @@ namespace Kernel EXTERN_C IDylibRef rtl_init_dylib(UserProcess& header); EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); -} // namespace Kernel +} // namespace NeOS #endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */ diff --git a/dev/Kernel/KernelKit/LPC.h b/dev/Kernel/KernelKit/LPC.h index a962bc05..d76eeff1 100644 --- a/dev/Kernel/KernelKit/LPC.h +++ b/dev/Kernel/KernelKit/LPC.h @@ -11,15 +11,15 @@ /// @file LPC.h /// @brief Local Process Codes. -#define err_local_ok() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == Kernel::kErrorSuccess) -#define err_local_fail() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != Kernel::kErrorSuccess) -#define err_local_get() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) +#define err_local_ok() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == NeOS::kErrorSuccess) +#define err_local_fail() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != NeOS::kErrorSuccess) +#define err_local_get() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) -#define err_global_ok() (Kernel::kErrorLocalNumber == Kernel::kErrorSuccess) -#define err_global_fail() (Kernel::kErrorLocalNumber != Kernel::kErrorSuccess) -#define err_global_get() (Kernel::kErrorLocalNumber) +#define err_global_ok() (NeOS::kErrorLocalNumber == NeOS::kErrorSuccess) +#define err_global_fail() (NeOS::kErrorLocalNumber != NeOS::kErrorSuccess) +#define err_global_get() (NeOS::kErrorLocalNumber) -namespace Kernel +namespace NeOS { typedef Int32 HError; @@ -67,4 +67,4 @@ namespace Kernel /// @param void no params are needed. /// @return if error-free: false, otherwise true. Boolean err_bug_check(Void) noexcept; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h index c2cbb93c..fb17176e 100644 --- a/dev/Kernel/KernelKit/LoaderInterface.h +++ b/dev/Kernel/KernelKit/LoaderInterface.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/ErrorOr.h> -namespace Kernel +namespace NeOS { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss @@ -31,4 +31,4 @@ namespace Kernel virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const Char* name, _Input Int32 kind) = 0; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/LockDelegate.h b/dev/Kernel/KernelKit/LockDelegate.h index 89daea60..a657caa0 100644 --- a/dev/Kernel/KernelKit/LockDelegate.h +++ b/dev/Kernel/KernelKit/LockDelegate.h @@ -9,7 +9,7 @@ #include <NewKit/Atom.h> #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { enum { @@ -66,4 +66,4 @@ namespace Kernel private: Atom<UInt> fLockStatus; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/MSDOS.h b/dev/Kernel/KernelKit/MSDOS.h index d0d2533b..1a3df13b 100644 --- a/dev/Kernel/KernelKit/MSDOS.h +++ b/dev/Kernel/KernelKit/MSDOS.h @@ -23,30 +23,30 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef Kernel::UInt32 DosWord; -typedef Kernel::Long DosLong; +typedef NeOS::UInt32 DosWord; +typedef NeOS::Long DosLong; typedef struct _DosHeader { - Kernel::UInt8 eMagic[2]; - DosWord eMagLen; - DosWord ePagesCount; - DosWord eCrlc; - DosWord eCParHdr; - DosWord eMinAlloc; - DosWord eMaxAlloc; - DosWord eStackSeg; - DosWord eStackPtr; - DosWord eChksum; - DosWord eIp; - DosWord eCs; - DosWord eLfarlc; - DosWord eOvno; - DosWord eRes[4]; - DosWord eOemid; - DosWord eOeminfo; - DosWord eRes2[10]; - DosLong eLfanew; + NeOS::UInt8 eMagic[2]; + DosWord eMagLen; + DosWord ePagesCount; + DosWord eCrlc; + DosWord eCParHdr; + DosWord eMinAlloc; + DosWord eMaxAlloc; + DosWord eStackSeg; + DosWord eStackPtr; + DosWord eChksum; + DosWord eIp; + DosWord eCs; + DosWord eLfarlc; + DosWord eOvno; + DosWord eRes[4]; + DosWord eOemid; + DosWord eOeminfo; + DosWord eRes2[10]; + DosLong eLfanew; } DosHeader, *DosHeaderPtr; #endif /* ifndef __MSDOS_EXEC__ */ diff --git a/dev/Kernel/KernelKit/MemoryMgr.h b/dev/Kernel/KernelKit/MemoryMgr.h index 81cfe63b..ac12587f 100644 --- a/dev/Kernel/KernelKit/MemoryMgr.h +++ b/dev/Kernel/KernelKit/MemoryMgr.h @@ -15,7 +15,7 @@ #include <KernelKit/LPC.h> #include <Hints/CompilerHint.h> -namespace Kernel +namespace NeOS { /// @brief Declare pointer as free. /// @param heap_ptr the pointer. @@ -66,7 +66,7 @@ namespace Kernel { if (*cls) { - err_global_get() = Kernel::kErrorInvalidData; + err_global_get() = NeOS::kErrorInvalidData; return NO; } @@ -82,6 +82,6 @@ namespace Kernel delete *cls; *cls = nullptr; } -} // namespace Kernel +} // namespace NeOS #endif // !INC_KERNEL_HEAP_H diff --git a/dev/Kernel/KernelKit/PCI/DMA.h b/dev/Kernel/KernelKit/PCI/DMA.h index ab740d01..d5a59577 100644 --- a/dev/Kernel/KernelKit/PCI/DMA.h +++ b/dev/Kernel/KernelKit/PCI/DMA.h @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { enum class DmaKind { @@ -76,6 +76,6 @@ namespace Kernel public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace Kernel +} // namespace NeOS #include <KernelKit/PCI/DMA.inl> diff --git a/dev/Kernel/KernelKit/PCI/DMA.inl b/dev/Kernel/KernelKit/PCI/DMA.inl index efa789bf..0ea2c343 100644 --- a/dev/Kernel/KernelKit/PCI/DMA.inl +++ b/dev/Kernel/KernelKit/PCI/DMA.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { template <class T> T* DMAWrapper::operator->() @@ -17,4 +17,4 @@ namespace Kernel { return reinterpret_cast<T*>((UIntPtr)fAddress + offset); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/Database.h b/dev/Kernel/KernelKit/PCI/Database.h index 8bd67078..82f38d33 100644 --- a/dev/Kernel/KernelKit/PCI/Database.h +++ b/dev/Kernel/KernelKit/PCI/Database.h @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.h> #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { namespace Types { @@ -35,4 +35,4 @@ namespace Kernel Invalid = Unassgined, }; } // namespace Types -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/Device.h b/dev/Kernel/KernelKit/PCI/Device.h index cb463485..9870f618 100644 --- a/dev/Kernel/KernelKit/PCI/Device.h +++ b/dev/Kernel/KernelKit/PCI/Device.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace Kernel::PCI +namespace NeOS::PCI { enum class PciConfigKind : UShort { @@ -75,7 +75,7 @@ namespace Kernel::PCI UShort fFunction; UInt32 fBar; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI -EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); -EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(NeOS::UInt bar); +EXTERN_C NeOS::UInt NewOSPCIReadRaw(NeOS::UInt bar); diff --git a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl index da9ba1e4..0bac35bc 100644 --- a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { template <SizeT Sz> template <typename T> @@ -51,4 +51,4 @@ namespace Kernel break; } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/IO.h b/dev/Kernel/KernelKit/PCI/IO.h index 4e405020..b6d491ce 100644 --- a/dev/Kernel/KernelKit/PCI/IO.h +++ b/dev/Kernel/KernelKit/PCI/IO.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { template <SizeT Sz> class IOArray final @@ -50,7 +50,7 @@ namespace Kernel }; using IOArray16 = IOArray<16>; -} // namespace Kernel +} // namespace NeOS #ifdef __x86_64__ #include <KernelKit/PCI/IO-Impl-AMD64.inl> diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/Kernel/KernelKit/PCI/Iterator.h index c364e1f7..2a788450 100644 --- a/dev/Kernel/KernelKit/PCI/Iterator.h +++ b/dev/Kernel/KernelKit/PCI/Iterator.h @@ -17,7 +17,7 @@ #define NE_DEVICE_COUNT (33) #define NE_FUNCTION_COUNT (8) -namespace Kernel::PCI +namespace NeOS::PCI { class Iterator final { @@ -38,6 +38,6 @@ namespace Kernel::PCI private: Array<PCI::Device, NE_BUS_COUNT> fDevices; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI #endif // __PCI_ITERATOR_H__ diff --git a/dev/Kernel/KernelKit/PCI/PCI.h b/dev/Kernel/KernelKit/PCI/PCI.h index 8fe751f2..4bc4aa82 100644 --- a/dev/Kernel/KernelKit/PCI/PCI.h +++ b/dev/Kernel/KernelKit/PCI/PCI.h @@ -15,7 +15,7 @@ #define kPCIFuncCount (8) #define kPCIBusCount (255) -namespace Kernel::PCI +namespace NeOS::PCI { // model struct DeviceHeader @@ -56,4 +56,4 @@ namespace Kernel::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/KernelKit/PE.h b/dev/Kernel/KernelKit/PE.h index 0f5c7755..a4ae5c4a 100644 --- a/dev/Kernel/KernelKit/PE.h +++ b/dev/Kernel/KernelKit/PE.h @@ -29,62 +29,62 @@ typedef struct LDR_EXEC_HEADER final { - Kernel::UInt32 mSignature; - Kernel::UInt16 mMachine; - Kernel::UInt16 mNumberOfSections; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt32 mPointerToSymbolTable; - Kernel::UInt32 mNumberOfSymbols; - Kernel::UInt16 mSizeOfOptionalHeader; - Kernel::UInt16 mCharacteristics; + NeOS::UInt32 mSignature; + NeOS::UInt16 mMachine; + NeOS::UInt16 mNumberOfSections; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt32 mPointerToSymbolTable; + NeOS::UInt32 mNumberOfSymbols; + NeOS::UInt16 mSizeOfOptionalHeader; + NeOS::UInt16 mCharacteristics; } LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR; typedef struct LDR_OPTIONAL_HEADER final { - Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - Kernel::UInt8 mMajorLinkerVersion; - Kernel::UInt8 mMinorLinkerVersion; - Kernel::UInt32 mSizeOfCode; - Kernel::UInt32 mSizeOfInitializedData; - Kernel::UInt32 mSizeOfUninitializedData; - Kernel::UInt32 mAddressOfEntryPoint; - Kernel::UInt32 mBaseOfCode; - Kernel::UInt32 mBaseOfData; - Kernel::UInt32 mImageBase; - Kernel::UInt32 mSectionAlignment; - Kernel::UInt32 mFileAlignment; - Kernel::UInt16 mMajorOperatingSystemVersion; - Kernel::UInt16 mMinorOperatingSystemVersion; - Kernel::UInt16 mMajorImageVersion; - Kernel::UInt16 mMinorImageVersion; - Kernel::UInt16 mMajorSubsystemVersion; - Kernel::UInt16 mMinorSubsystemVersion; - Kernel::UInt32 mWin32VersionValue; - Kernel::UInt32 mSizeOfImage; - Kernel::UInt32 mSizeOfHeaders; - Kernel::UInt32 mCheckSum; - Kernel::UInt16 mSubsystem; - Kernel::UInt16 mDllCharacteristics; - Kernel::UInt32 mSizeOfStackReserve; - Kernel::UInt32 mSizeOfStackCommit; - Kernel::UInt32 mSizeOfHeapReserve; - Kernel::UInt32 mSizeOfHeapCommit; - Kernel::UInt32 mLoaderFlags; - Kernel::UInt32 mNumberOfRvaAndSizes; + NeOS::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + NeOS::UInt8 mMajorLinkerVersion; + NeOS::UInt8 mMinorLinkerVersion; + NeOS::UInt32 mSizeOfCode; + NeOS::UInt32 mSizeOfInitializedData; + NeOS::UInt32 mSizeOfUninitializedData; + NeOS::UInt32 mAddressOfEntryPoint; + NeOS::UInt32 mBaseOfCode; + NeOS::UInt32 mBaseOfData; + NeOS::UInt32 mImageBase; + NeOS::UInt32 mSectionAlignment; + NeOS::UInt32 mFileAlignment; + NeOS::UInt16 mMajorOperatingSystemVersion; + NeOS::UInt16 mMinorOperatingSystemVersion; + NeOS::UInt16 mMajorImageVersion; + NeOS::UInt16 mMinorImageVersion; + NeOS::UInt16 mMajorSubsystemVersion; + NeOS::UInt16 mMinorSubsystemVersion; + NeOS::UInt32 mWin32VersionValue; + NeOS::UInt32 mSizeOfImage; + NeOS::UInt32 mSizeOfHeaders; + NeOS::UInt32 mCheckSum; + NeOS::UInt16 mSubsystem; + NeOS::UInt16 mDllCharacteristics; + NeOS::UInt32 mSizeOfStackReserve; + NeOS::UInt32 mSizeOfStackCommit; + NeOS::UInt32 mSizeOfHeapReserve; + NeOS::UInt32 mSizeOfHeapCommit; + NeOS::UInt32 mLoaderFlags; + NeOS::UInt32 mNumberOfRvaAndSizes; } LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR; typedef struct LDR_SECTION_HEADER final { - Kernel::Char mName[8]; - Kernel::UInt32 mVirtualSize; - Kernel::UInt32 mVirtualAddress; - Kernel::UInt32 mSizeOfRawData; - Kernel::UInt32 mPointerToRawData; - Kernel::UInt32 mPointerToRelocations; - Kernel::UInt32 mPointerToLineNumbers; - Kernel::UInt16 mNumberOfRelocations; - Kernel::UInt16 mNumberOfLinenumbers; - Kernel::UInt32 mCharacteristics; + NeOS::Char mName[8]; + NeOS::UInt32 mVirtualSize; + NeOS::UInt32 mVirtualAddress; + NeOS::UInt32 mSizeOfRawData; + NeOS::UInt32 mPointerToRawData; + NeOS::UInt32 mPointerToRelocations; + NeOS::UInt32 mPointerToLineNumbers; + NeOS::UInt16 mNumberOfRelocations; + NeOS::UInt16 mNumberOfLinenumbers; + NeOS::UInt32 mCharacteristics; } LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR; enum kExecDataDirParams @@ -97,35 +97,35 @@ enum kExecDataDirParams typedef struct LDR_EXPORT_DIRECTORY { - Kernel::UInt32 mCharacteristics; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt16 mMajorVersion; - Kernel::UInt16 mMinorVersion; - Kernel::UInt32 mName; - Kernel::UInt32 mBase; - Kernel::UInt32 mNumberOfFunctions; - Kernel::UInt32 mNumberOfNames; - Kernel::UInt32 mAddressOfFunctions; // export table rva - Kernel::UInt32 mAddressOfNames; - Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva + NeOS::UInt32 mCharacteristics; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt16 mMajorVersion; + NeOS::UInt16 mMinorVersion; + NeOS::UInt32 mName; + NeOS::UInt32 mBase; + NeOS::UInt32 mNumberOfFunctions; + NeOS::UInt32 mNumberOfNames; + NeOS::UInt32 mAddressOfFunctions; // export table rva + NeOS::UInt32 mAddressOfNames; + NeOS::UInt32 mAddressOfNameOrdinal; // ordinal table rva } LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR; typedef struct LDR_IMPORT_DIRECTORY { union { - Kernel::UInt32 mCharacteristics; - Kernel::UInt32 mOriginalFirstThunk; + NeOS::UInt32 mCharacteristics; + NeOS::UInt32 mOriginalFirstThunk; }; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt32 mForwarderChain; - Kernel::UInt32 mNameRva; - Kernel::UInt32 mThunkTableRva; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt32 mForwarderChain; + NeOS::UInt32 mNameRva; + NeOS::UInt32 mThunkTableRva; } LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR; typedef struct LDR_DATA_DIRECTORY { - Kernel::UInt32 VirtualAddress; - Kernel::UInt32 Size; + NeOS::UInt32 VirtualAddress; + NeOS::UInt32 Size; } LDR_DATA_DIRECTORY, *LDR_DATA_DIRECTORY_PTR; typedef struct LDR_IMAGE_HEADER diff --git a/dev/Kernel/KernelKit/PEF.h b/dev/Kernel/KernelKit/PEF.h index a49c4fc6..48e5c243 100644 --- a/dev/Kernel/KernelKit/PEF.h +++ b/dev/Kernel/KernelKit/PEF.h @@ -44,7 +44,7 @@ #define kPefForkKind kPefMagic #define kPefForkKindFAT kPefMagicFat -namespace Kernel +namespace NeOS { enum { @@ -112,6 +112,6 @@ namespace Kernel kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace Kernel +} // namespace NeOS #endif /* ifndef KERNELKIT_PEF_H */ diff --git a/dev/Kernel/KernelKit/PEFCodeMgr.h b/dev/Kernel/KernelKit/PEFCodeMgr.h index aa82f84d..47aea432 100644 --- a/dev/Kernel/KernelKit/PEFCodeMgr.h +++ b/dev/Kernel/KernelKit/PEFCodeMgr.h @@ -18,7 +18,7 @@ #define kPefApplicationMime "application/vnd-zka-executable" -namespace Kernel +namespace NeOS { /// /// \name PEFLoader @@ -67,6 +67,6 @@ namespace Kernel { ProcessID rtl_create_process(PEFLoader& exec, const Int32& procKind) noexcept; } // namespace Utils -} // namespace Kernel +} // namespace NeOS #endif // ifndef _INC_CODE_MANAGER_PEF_H_ diff --git a/dev/Kernel/KernelKit/Semaphore.h b/dev/Kernel/KernelKit/Semaphore.h index 7738b53a..5d77b84d 100644 --- a/dev/Kernel/KernelKit/Semaphore.h +++ b/dev/Kernel/KernelKit/Semaphore.h @@ -10,7 +10,7 @@ #include <KernelKit/Timer.h> #include <CompilerKit/CompilerKit.h> -namespace Kernel +namespace NeOS { class UserProcess; @@ -40,4 +40,4 @@ namespace Kernel private: UserProcessRef fLockingProcess; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.h b/dev/Kernel/KernelKit/ThreadLocalStorage.h index 5f80d7c7..573b40b8 100644 --- a/dev/Kernel/KernelKit/ThreadLocalStorage.h +++ b/dev/Kernel/KernelKit/ThreadLocalStorage.h @@ -28,12 +28,12 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr Record{nullptr}; //! Thread information record. + NeOS::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + NeOS::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. -Kernel::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); +NeOS::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); ///! @brief new ptr syscall. template <typename T> @@ -41,26 +41,26 @@ T* tls_new_ptr(void) noexcept; ///! @brief delete ptr syscall. template <typename T> -Kernel::Boolean tls_delete_ptr(T* ptr) noexcept; +NeOS::Boolean tls_delete_ptr(T* ptr) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept; +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept; +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept; template <typename T, typename... Args> T* tls_new_class(Args&&... args); /// @brief TLS install TIB and PIB. (syscall) -EXTERN_C Kernel::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); +EXTERN_C NeOS::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); /// @brief TLS check (syscall) -EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; +EXTERN_C NeOS::Bool tls_check_syscall_impl(NeOS::VoidPtr TIB) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.inl b/dev/Kernel/KernelKit/ThreadLocalStorage.inl index 0517dada..d912f5aa 100644 --- a/dev/Kernel/KernelKit/ThreadLocalStorage.inl +++ b/dev/Kernel/KernelKit/ThreadLocalStorage.inl @@ -14,7 +14,7 @@ template <typename T> inline T* tls_new_ptr(void) noexcept { - using namespace Kernel; + using namespace NeOS; auto ref_process = UserProcessScheduler::The().CurrentProcess(); MUST_PASS(ref_process); @@ -30,9 +30,9 @@ inline T* tls_new_ptr(void) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(T* obj) noexcept +inline NeOS::Bool tls_delete_ptr(T* obj) noexcept { - using namespace Kernel; + using namespace NeOS; if (!obj) return No; @@ -48,7 +48,7 @@ inline Kernel::Bool tls_delete_ptr(T* obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept { return tls_delete_ptr(obj.Leak()); } @@ -56,7 +56,7 @@ inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept { return tls_delete_ptr(obj->Leak()); } @@ -69,7 +69,7 @@ inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept template <typename T, typename... Args> T* tls_new_class(Args&&... args) { - using namespace Kernel; + using namespace NeOS; T* obj = tls_new_ptr<T>(); @@ -87,9 +87,9 @@ T* tls_new_class(Args&&... args) /// @param obj /// @return template <typename T> -inline Kernel::Bool tls_delete_class(T* obj) +inline NeOS::Bool tls_delete_class(T* obj) { - using namespace Kernel; + using namespace NeOS; if (!obj) return No; diff --git a/dev/Kernel/KernelKit/Timer.h b/dev/Kernel/KernelKit/Timer.h index e22b71a2..6328c1a1 100644 --- a/dev/Kernel/KernelKit/Timer.h +++ b/dev/Kernel/KernelKit/Timer.h @@ -9,7 +9,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/LPC.h> -namespace Kernel +namespace NeOS { class SoftwareTimer; class TimerInterface; @@ -78,4 +78,4 @@ namespace Kernel return 1000 * Milliseconds(time); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h index dcdb0f18..41cf57e2 100644 --- a/dev/Kernel/KernelKit/User.h +++ b/dev/Kernel/KernelKit/User.h @@ -23,7 +23,7 @@ #define kMaxUserNameLen (255U) #define kMaxUserTokenLen (255U) -namespace Kernel +namespace NeOS { class User; @@ -81,6 +81,6 @@ namespace Kernel Char mUserName[kMaxUserNameLen] = {0}; Char mUserKey[kMaxUserTokenLen] = {0}; }; -} // namespace Kernel +} // namespace NeOS #endif /* ifndef INC_USER_H */ diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h index 6c96c8e5..17d992b4 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.h +++ b/dev/Kernel/KernelKit/UserProcessScheduler.h @@ -26,7 +26,7 @@ // The current date is: Thu 11/28/2024 // //////////////////////////////////////////////////// -namespace Kernel +namespace NeOS { //! @note Forward class declarations. @@ -329,7 +329,7 @@ namespace Kernel }; const UInt32& sched_get_exit_code(void) noexcept; -} // namespace Kernel +} // namespace NeOS #include <KernelKit/ThreadLocalStorage.h> #include <KernelKit/UserProcessScheduler.inl> diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.inl b/dev/Kernel/KernelKit/UserProcessScheduler.inl index a0c1d335..6dd8c434 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.inl +++ b/dev/Kernel/KernelKit/UserProcessScheduler.inl @@ -7,7 +7,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { /***********************************************************************************/ /** @brief Free pointer from usage. */ @@ -48,4 +48,4 @@ namespace Kernel return No; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/XCOFF.h b/dev/Kernel/KernelKit/XCOFF.h index 1c577a7b..57cb0c73 100644 --- a/dev/Kernel/KernelKit/XCOFF.h +++ b/dev/Kernel/KernelKit/XCOFF.h @@ -29,13 +29,13 @@ struct XCoffForkHeader; /// @brief XCoff file header, meant for POWER apps. typedef struct XCoffFileHeader { - Kernel::UInt16 fMagic; - Kernel::UInt16 fTarget; - Kernel::UInt16 fNumSecs; - Kernel::UInt32 fTimeDat; - Kernel::UIntPtr fSymPtr; - Kernel::UInt32 fNumSyms; - Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header + NeOS::UInt16 fMagic; + NeOS::UInt16 fTarget; + NeOS::UInt16 fNumSecs; + NeOS::UInt32 fTimeDat; + NeOS::UIntPtr fSymPtr; + NeOS::UInt32 fNumSyms; + NeOS::UInt16 fOptHdr; // ?: Number of bytes in optional header } XCoffFileHeader64; #define cForkNameLen (255) @@ -43,9 +43,9 @@ typedef struct XCoffFileHeader /// @brief This the executable manifest fork. typedef struct XCoffForkHeader { - Kernel::Char fPropertiesXMLFork[cForkNameLen]; - Kernel::Char fDynamicLoaderFork[cForkNameLen]; - Kernel::Char fCodeSignFork[cForkNameLen]; + NeOS::Char fPropertiesXMLFork[cForkNameLen]; + NeOS::Char fDynamicLoaderFork[cForkNameLen]; + NeOS::Char fCodeSignFork[cForkNameLen]; } XCoffForkHeader; #endif // ifndef INC_XOCFF_H diff --git a/dev/Kernel/NetworkKit/IP.h b/dev/Kernel/NetworkKit/IP.h index e9304426..0beae91e 100644 --- a/dev/Kernel/NetworkKit/IP.h +++ b/dev/Kernel/NetworkKit/IP.h @@ -11,7 +11,7 @@ #include <NewKit/Ref.h> #include <NewKit/KString.h> -namespace Kernel +namespace NeOS { class RawIPAddress6; class RawIPAddress; @@ -80,4 +80,4 @@ namespace Kernel static ErrorOr<KString> ToKString(Ref<RawIPAddress>& ipv4); static bool IpCheckVersion4(const Char* ip); }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NetworkKit/IPC.h b/dev/Kernel/NetworkKit/IPC.h index 10185540..8ac1b63e 100644 --- a/dev/Kernel/NetworkKit/IPC.h +++ b/dev/Kernel/NetworkKit/IPC.h @@ -25,7 +25,7 @@ #define kIPCHeaderMagic (0x4950434) -namespace Kernel +namespace NeOS { struct IPC_ADDR; struct IPC_MSG; @@ -101,6 +101,6 @@ namespace Kernel /// @retval true packet is correct. /// @retval false packet is incorrect and process has crashed. Bool ipc_construct_packet(_Output _Input IPC_MSG** pckt_in); -} // namespace Kernel +} // namespace NeOS #endif // INC_IPC_H diff --git a/dev/Kernel/NetworkKit/MAC.h b/dev/Kernel/NetworkKit/MAC.h index 379102ba..f9be61a0 100644 --- a/dev/Kernel/NetworkKit/MAC.h +++ b/dev/Kernel/NetworkKit/MAC.h @@ -10,7 +10,7 @@ #include <NewKit/Defines.h> #include <NewKit/KString.h> -namespace Kernel +namespace NeOS { class MacAddressGetter; @@ -26,4 +26,4 @@ namespace Kernel Array<WideChar, 12>& AsBytes(); }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NetworkKit/NetworkDevice.h b/dev/Kernel/NetworkKit/NetworkDevice.h index 60b71f97..c90addf1 100644 --- a/dev/Kernel/NetworkKit/NetworkDevice.h +++ b/dev/Kernel/NetworkKit/NetworkDevice.h @@ -12,7 +12,7 @@ /// @note Can either work with: Ethernet, GPRS, WiFi -namespace Kernel +namespace NeOS { struct NetworkDeviceCommand; class NetworkDevice; @@ -76,7 +76,7 @@ namespace Kernel /// @brief LTE device. using LTENetworkDevice = NetworkDevice; -} // namespace Kernel +} // namespace NeOS #include <NetworkKit/NetworkDevice.inl> diff --git a/dev/Kernel/NetworkKit/NetworkDevice.inl b/dev/Kernel/NetworkKit/NetworkDevice.inl index 39554f9d..74298a22 100644 --- a/dev/Kernel/NetworkKit/NetworkDevice.inl +++ b/dev/Kernel/NetworkKit/NetworkDevice.inl @@ -8,7 +8,7 @@ Dtor and ctors. */ -namespace Kernel +namespace NeOS { NetworkDevice::NetworkDevice(void (*out)(NetworkDeviceCommand), void (*in)(NetworkDeviceCommand), @@ -29,4 +29,4 @@ namespace Kernel if (fCleanup) fCleanup(); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Array.h b/dev/Kernel/NewKit/Array.h index 43c67586..54c09636 100644 --- a/dev/Kernel/NewKit/Array.h +++ b/dev/Kernel/NewKit/Array.h @@ -10,7 +10,7 @@ #include <NewKit/ErrorOr.h> #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { template <typename T, SizeT N> class Array final @@ -62,4 +62,4 @@ namespace Kernel { return Array<ValueType, ARRAY_SIZE(val)>{val}; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/ArrayList.h b/dev/Kernel/NewKit/ArrayList.h index e05480f0..06763b5a 100644 --- a/dev/Kernel/NewKit/ArrayList.h +++ b/dev/Kernel/NewKit/ArrayList.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { template <typename T> class ArrayList final @@ -60,4 +60,4 @@ namespace Kernel { return ArrayList<ValueType>{val}; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Atom.h b/dev/Kernel/NewKit/Atom.h index 6845aee8..d4797715 100644 --- a/dev/Kernel/NewKit/Atom.h +++ b/dev/Kernel/NewKit/Atom.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { template <typename T> class Atom final @@ -43,4 +43,4 @@ namespace Kernel private: T fArrayOfAtoms; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Crc32.h b/dev/Kernel/NewKit/Crc32.h index 1facaace..38d2f8fa 100644 --- a/dev/Kernel/NewKit/Crc32.h +++ b/dev/Kernel/NewKit/Crc32.h @@ -15,9 +15,9 @@ #define kCrcCnt (256) -namespace Kernel +namespace NeOS { UInt ke_calculate_crc32(const Char* crc, UInt len) noexcept; -} // namespace Kernel +} // namespace NeOS #endif // !CRC32_H diff --git a/dev/Kernel/NewKit/Defines.h b/dev/Kernel/NewKit/Defines.h index 25d44b9d..932e9e8f 100644 --- a/dev/Kernel/NewKit/Defines.h +++ b/dev/Kernel/NewKit/Defines.h @@ -20,7 +20,7 @@ #endif /// @brief The **Kernel** namespace where it's API resides. -namespace Kernel +namespace NeOS { using voidPtr = void*; using VoidPtr = void*; @@ -189,4 +189,4 @@ namespace Kernel return NO; } }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/ErrorOr.h b/dev/Kernel/NewKit/ErrorOr.h index 433e7c9b..4396d7ec 100644 --- a/dev/Kernel/NewKit/ErrorOr.h +++ b/dev/Kernel/NewKit/ErrorOr.h @@ -12,7 +12,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { using ErrorT = UInt; @@ -74,4 +74,4 @@ namespace Kernel using ErrorOrAny = ErrorOr<voidPtr>; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Function.h b/dev/Kernel/NewKit/Function.h index 9fa218af..d25c06c1 100644 --- a/dev/Kernel/NewKit/Function.h +++ b/dev/Kernel/NewKit/Function.h @@ -3,7 +3,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { template <typename T, typename... Args> class Function final @@ -48,6 +48,6 @@ namespace Kernel T(*fFn) (Args... args); }; -} // namespace Kernel +} // namespace NeOS #endif // !_INC_FUNCTION_H__ diff --git a/dev/Kernel/NewKit/Json.h b/dev/Kernel/NewKit/Json.h index a376c15a..7b53fa4a 100644 --- a/dev/Kernel/NewKit/Json.h +++ b/dev/Kernel/NewKit/Json.h @@ -19,7 +19,7 @@ #define kJSONLen 256 #define kJSONNull "[]" -namespace Kernel +namespace NeOS { /// @brief JavaScript object class class Json final @@ -148,4 +148,4 @@ namespace Kernel }; using JsonStream = Stream<JsonStreamReader, Json>; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/KString.h b/dev/Kernel/NewKit/KString.h index dc327f3b..85da1f3c 100644 --- a/dev/Kernel/NewKit/KString.h +++ b/dev/Kernel/NewKit/KString.h @@ -14,7 +14,7 @@ #define cMinimumStringSize 8196 -namespace Kernel +namespace NeOS { /// @brief Kernel string class, not dynamic. class KString final @@ -91,4 +91,4 @@ namespace Kernel static bool Equals(const Char* lhs, const Char* rhs); static bool Equals(const WideChar* lhs, const WideChar* rhs); }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/KernelPanic.h b/dev/Kernel/NewKit/KernelPanic.h index cd19a1d3..11f9a05d 100644 --- a/dev/Kernel/NewKit/KernelPanic.h +++ b/dev/Kernel/NewKit/KernelPanic.h @@ -9,7 +9,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { void ke_runtime_check(bool expr, const Char* file, const Char* line); } @@ -34,14 +34,14 @@ namespace Kernel #endif #define __MUST_PASS(EXPR, FILE, LINE) \ - Kernel::ke_runtime_check(EXPR, FILE, STRINGIFY(LINE)) + NeOS::ke_runtime_check(EXPR, FILE, STRINGIFY(LINE)) #ifdef __DEBUG__ #define MUST_PASS(EXPR) __MUST_PASS((EXPR), __FILE__, __LINE__) #define assert(EXPR) MUST_PASS(EXPR) #else -#define MUST_PASS(EXPR) (Kernel::Void)(EXPR) -#define assert(EXPR) (Kernel::Void)(EXPR) +#define MUST_PASS(EXPR) (NeOS::Void)(EXPR) +#define assert(EXPR) (NeOS::Void)(EXPR) #endif enum RUNTIME_CHECK @@ -68,7 +68,7 @@ enum RUNTIME_CHECK typedef enum RUNTIME_CHECK RTL_RUNTIME_CHECK; -namespace Kernel +namespace NeOS { void ke_panic(const Int32& id, const Char* message = nullptr); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Macros.h b/dev/Kernel/NewKit/Macros.h index 15d5f2bd..56f7ca4d 100644 --- a/dev/Kernel/NewKit/Macros.h +++ b/dev/Kernel/NewKit/Macros.h @@ -7,41 +7,41 @@ #pragma once #ifndef KIB -#define KIB(X) (Kernel::UInt64)((X) / 1024) +#define KIB(X) (NeOS::UInt64)((X) / 1024) #endif #ifndef kib_cast -#define kib_cast(X) (Kernel::UInt64)((X) * 1024) +#define kib_cast(X) (NeOS::UInt64)((X) * 1024) #endif #ifndef MIB -#define MIB(X) (Kernel::UInt64)((Kernel::UInt64)KIB(X) / 1024) +#define MIB(X) (NeOS::UInt64)((NeOS::UInt64)KIB(X) / 1024) #endif #ifndef mib_cast -#define mib_cast(X) (Kernel::UInt64)((Kernel::UInt64)kib_cast(X) * 1024) +#define mib_cast(X) (NeOS::UInt64)((NeOS::UInt64)kib_cast(X) * 1024) #endif #ifndef GIB -#define GIB(X) (Kernel::UInt64)((Kernel::UInt64)MIB(X) / 1024) +#define GIB(X) (NeOS::UInt64)((NeOS::UInt64)MIB(X) / 1024) #endif #ifndef gib_cast -#define gib_cast(X) (Kernel::UInt64)((Kernel::UInt64)mib_cast(X) * 1024) +#define gib_cast(X) (NeOS::UInt64)((NeOS::UInt64)mib_cast(X) * 1024) #endif #ifndef TIB -#define TIB(X) (Kernel::UInt64)((Kernel::UInt64)GIB(X) / 1024) +#define TIB(X) (NeOS::UInt64)((NeOS::UInt64)GIB(X) / 1024) #endif #ifndef tib_cast -#define tib_cast(X) ((Kernel::UInt64)gib_cast(X) * 1024) +#define tib_cast(X) ((NeOS::UInt64)gib_cast(X) * 1024) #endif #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) \ (((sizeof(a) / sizeof(*(a))) / \ - (static_cast<Kernel::Size>(!(sizeof(a) % sizeof(*(a))))))) + (static_cast<NeOS::Size>(!(sizeof(a) % sizeof(*(a))))))) #endif #define DEPRECATED ATTRIBUTE(deprecated) @@ -114,10 +114,10 @@ #define CONST const #define STRINGIFY(X) #X -#define NE_UNUSED(X) ((Kernel::Void)X) +#define NE_UNUSED(X) ((NeOS::Void)X) #ifndef RGB -#define RGB(R, G, B) (Kernel::UInt32)(R | G << 0x8 | B << 0x10) +#define RGB(R, G, B) (NeOS::UInt32)(R | G << 0x8 | B << 0x10) #endif // !RGB #ifdef __NE_AMD64__ @@ -126,10 +126,10 @@ #define dbg_break_point() ((void)0) #endif -#define RTL_ENDIAN(address, value) \ - (((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \ - ? (Kernel::Endian::kEndianBig) \ - : (Kernel::Endian::kEndianLittle)) +#define RTL_ENDIAN(address, value) \ + (((reinterpret_cast<NeOS::Char*>(address)[0]) == (value)) \ + ? (NeOS::Endian::kEndianBig) \ + : (NeOS::Endian::kEndianLittle)) #define Yes true #define No false @@ -140,7 +140,7 @@ #define TRUE true #define FALSE false -#define BOOL Kernel::Boolean +#define BOOL NeOS::Boolean #ifdef RTL_INIT_OBJECT #undef RTL_INIT_OBJECT diff --git a/dev/Kernel/NewKit/MutableArray.h b/dev/Kernel/NewKit/MutableArray.h index f64c8cad..bfb432de 100644 --- a/dev/Kernel/NewKit/MutableArray.h +++ b/dev/Kernel/NewKit/MutableArray.h @@ -38,7 +38,7 @@ // FIXME: this is a shitty algorithm, which is consumer hungry. // Remove and occurences of that, and remove that class. -namespace Kernel +namespace NeOS { template <typename T> class MutableArray; @@ -149,7 +149,7 @@ namespace Kernel MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - Kernel::SizeT fNodeCount{0}; + NeOS::SizeT fNodeCount{0}; private: // don't remove that @@ -234,6 +234,6 @@ namespace Kernel MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - Kernel::SizeT fNodeCount{0}; + NeOS::SizeT fNodeCount{0}; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/OwnPtr.h b/dev/Kernel/NewKit/OwnPtr.h index 5df29d7f..169f16d9 100644 --- a/dev/Kernel/NewKit/OwnPtr.h +++ b/dev/Kernel/NewKit/OwnPtr.h @@ -11,7 +11,7 @@ #include <NewKit/KernelPanic.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { template <typename T> class OwnPtr; @@ -91,4 +91,4 @@ namespace Kernel return ret; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/PageMgr.h b/dev/Kernel/NewKit/PageMgr.h index a26fccad..3d8e1f9a 100644 --- a/dev/Kernel/NewKit/PageMgr.h +++ b/dev/Kernel/NewKit/PageMgr.h @@ -12,7 +12,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { class PageMgr; @@ -78,4 +78,4 @@ namespace Kernel friend PTEWrapper; friend class Pmm; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Pair.h b/dev/Kernel/NewKit/Pair.h index 74ebf54c..05a95ff3 100644 --- a/dev/Kernel/NewKit/Pair.h +++ b/dev/Kernel/NewKit/Pair.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { class Pair; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Pmm.h b/dev/Kernel/NewKit/Pmm.h index 5b90628d..97bdc0eb 100644 --- a/dev/Kernel/NewKit/Pmm.h +++ b/dev/Kernel/NewKit/Pmm.h @@ -10,7 +10,7 @@ #include <NewKit/PageMgr.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { class Pmm; class PTEWrapper; @@ -41,4 +41,4 @@ namespace Kernel private: Ref<PageMgr> fPageMgr; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Ref.h b/dev/Kernel/NewKit/Ref.h index 45bcf95a..e41bf3bc 100644 --- a/dev/Kernel/NewKit/Ref.h +++ b/dev/Kernel/NewKit/Ref.h @@ -12,7 +12,7 @@ #include <NewKit/KernelPanic.h> #include <KernelKit/MemoryMgr.h> -namespace Kernel +namespace NeOS { template <typename T> class Ref final @@ -103,6 +103,6 @@ namespace Kernel private: Ref<T> fRef{nullptr}; }; -} // namespace Kernel +} // namespace NeOS #endif // ifndef _NEWKIT_REF_H_ diff --git a/dev/Kernel/NewKit/Stream.h b/dev/Kernel/NewKit/Stream.h index 9a23664d..541d3389 100644 --- a/dev/Kernel/NewKit/Stream.h +++ b/dev/Kernel/NewKit/Stream.h @@ -10,7 +10,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { template <typename StreamTrait, typename Kind> class Stream final @@ -55,4 +55,4 @@ namespace Kernel Ref<StreamTrait> fStream; Ref<Kind> fKind; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Utils.h b/dev/Kernel/NewKit/Utils.h index e9a3f9a7..48137e1f 100644 --- a/dev/Kernel/NewKit/Utils.h +++ b/dev/Kernel/NewKit/Utils.h @@ -9,7 +9,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len); Int rt_move_memory(const voidPtr src, voidPtr dst, Size len); @@ -27,4 +27,4 @@ namespace Kernel Int rt_to_lower(Int c); voidPtr rt_string_in_string(const Char* in, const Char* needle); char* rt_string_has_char(Char* str, const Char chr); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/NewKit/Variant.h b/dev/Kernel/NewKit/Variant.h index 352f486f..38dad66e 100644 --- a/dev/Kernel/NewKit/Variant.h +++ b/dev/Kernel/NewKit/Variant.h @@ -10,7 +10,7 @@ #include <NewKit/KString.h> #include <NewKit/Json.h> -namespace Kernel +namespace NeOS { class Variant final { @@ -67,4 +67,4 @@ namespace Kernel voidPtr fPtr{nullptr}; VariantKind fKind{VariantKind::kNull}; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/SignalKit/Signals.h b/dev/Kernel/SignalKit/Signals.h index 2e32e57f..e5e94e69 100644 --- a/dev/Kernel/SignalKit/Signals.h +++ b/dev/Kernel/SignalKit/Signals.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -typedef Kernel::UInt32 SignalKind; +typedef NeOS::UInt32 SignalKind; #define SIGKILL 0 #define SIGPAUS 1 diff --git a/dev/Kernel/StorageKit/AHCI.h b/dev/Kernel/StorageKit/AHCI.h index 226cb86c..6adab614 100644 --- a/dev/Kernel/StorageKit/AHCI.h +++ b/dev/Kernel/StorageKit/AHCI.h @@ -10,7 +10,7 @@ #include <KernelKit/DriveMgr.h> #include <NewKit/OwnPtr.h> -namespace Kernel +namespace NeOS { class AHCIDeviceInterface NE_DEVICE<MountpointInterface*> { @@ -30,4 +30,4 @@ namespace Kernel private: void (*fCleanup)(void) = {nullptr}; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/StorageKit/ATA.h b/dev/Kernel/StorageKit/ATA.h index e8c2ab67..0de90897 100644 --- a/dev/Kernel/StorageKit/ATA.h +++ b/dev/Kernel/StorageKit/ATA.h @@ -11,7 +11,7 @@ #include <NewKit/OwnPtr.h> #include <NewKit/Utils.h> -namespace Kernel +namespace NeOS { /// @brief ATA device interface type. class ATADeviceInterface : public IDeviceObject<MountpointInterface*> @@ -36,4 +36,4 @@ namespace Kernel private: void (*fCleanup)(void) = {nullptr}; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/StorageKit/NVME.h b/dev/Kernel/StorageKit/NVME.h index e6c968d6..6b7cc1fd 100644 --- a/dev/Kernel/StorageKit/NVME.h +++ b/dev/Kernel/StorageKit/NVME.h @@ -9,7 +9,7 @@ #include <KernelKit/DeviceMgr.h> #include <KernelKit/DriveMgr.h> -namespace Kernel +namespace NeOS { class NVMEDeviceInterface final NE_DEVICE<MountpointInterface*> { @@ -31,4 +31,4 @@ namespace Kernel private: Void (*fCleanup)(Void) = {nullptr}; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/StorageKit/PRDT.h b/dev/Kernel/StorageKit/PRDT.h index 603d4f23..40ba11e0 100644 --- a/dev/Kernel/StorageKit/PRDT.h +++ b/dev/Kernel/StorageKit/PRDT.h @@ -10,9 +10,9 @@ #include <KernelKit/PCI/Iterator.h> #include <NewKit/Ref.h> -#define kPrdtTransferSize (sizeof(Kernel::UShort)) +#define kPrdtTransferSize (sizeof(NeOS::UShort)) -namespace Kernel +namespace NeOS { /// @brief Tranfer information about PRD. enum kPRDTTransfer @@ -33,4 +33,4 @@ namespace Kernel void construct_prdt(Ref<PRDT>& prd); EXTERN_C Int32 kPRDTTransferStatus; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/StorageKit/StorageKit.h b/dev/Kernel/StorageKit/StorageKit.h index 954d368b..a0f1a2d1 100644 --- a/dev/Kernel/StorageKit/StorageKit.h +++ b/dev/Kernel/StorageKit/StorageKit.h @@ -10,7 +10,7 @@ #define kDriveSectorSizeSSD (512U) #define kDriveSectorSizeOptical (2048) -namespace Kernel +namespace NeOS { template <typename T> class IDeviceObject; @@ -19,4 +19,4 @@ namespace Kernel class AHCIDeviceInterface; class ATADeviceInterface; class SCSIDeviceInterface; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/SystemKit/SwapDisk.h b/dev/Kernel/SystemKit/SwapDisk.h index 8464a1ab..16413bf5 100644 --- a/dev/Kernel/SystemKit/SwapDisk.h +++ b/dev/Kernel/SystemKit/SwapDisk.h @@ -16,7 +16,7 @@ /// @file SwapDisk.h /// @brief Virtual memory swap disk. -namespace Kernel +namespace NeOS { struct SWAP_DISK_HEADER; @@ -45,4 +45,4 @@ namespace Kernel } PACKED SWAP_DISK_HEADER; typedef SWAP_DISK_HEADER* SWAP_DISK_HEADER_REF; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/ACPIFactoryInterface.cc b/dev/Kernel/src/ACPIFactoryInterface.cc index f5443188..0faaa46e 100644 --- a/dev/Kernel/src/ACPIFactoryInterface.cc +++ b/dev/Kernel/src/ACPIFactoryInterface.cc @@ -9,7 +9,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/MemoryMgr.h> -namespace Kernel +namespace NeOS { /// @brief Finds a descriptor table inside ACPI XSDT. ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) @@ -93,4 +93,4 @@ namespace Kernel return chr == 0; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/BitMapMgr.cc b/dev/Kernel/src/BitMapMgr.cc index 1fbdb33d..5a7f4561 100644 --- a/dev/Kernel/src/BitMapMgr.cc +++ b/dev/Kernel/src/BitMapMgr.cc @@ -22,7 +22,7 @@ #define kBitMapSizeIdx (1U) #define kBitMapUsedIdx (2U) -namespace Kernel +namespace NeOS { namespace HAL { @@ -192,4 +192,4 @@ namespace Kernel return ret; } } // namespace HAL -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/CodeMgr.cc b/dev/Kernel/src/CodeMgr.cc index 372ec607..c639155d 100644 --- a/dev/Kernel/src/CodeMgr.cc +++ b/dev/Kernel/src/CodeMgr.cc @@ -8,7 +8,7 @@ #include <NewKit/Utils.h> #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Executes a new process from a function. Kernel code only. @@ -25,4 +25,4 @@ namespace Kernel return UserProcessScheduler::The().Spawn(process_name, reinterpret_cast<VoidPtr>(main), nullptr); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Crc32.cc b/dev/Kernel/src/Crc32.cc index 2f765600..bbc0f9bf 100644 --- a/dev/Kernel/src/Crc32.cc +++ b/dev/Kernel/src/Crc32.cc @@ -9,7 +9,7 @@ // @file CRC32.cpp // @brief Check sequence implementation. -namespace Kernel +namespace NeOS { /// @brief The CRC32 seed table. UInt32 kCrcTbl[kCrcCnt] = { @@ -80,4 +80,4 @@ namespace Kernel // return (~crc); also works, does the same thing. return (crc ^ 0xffffffff); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/CxxAbi-AMD64.cc b/dev/Kernel/src/CxxAbi-AMD64.cc index 44bda187..f0e57077 100644 --- a/dev/Kernel/src/CxxAbi-AMD64.cc +++ b/dev/Kernel/src/CxxAbi-AMD64.cc @@ -15,11 +15,11 @@ atexit_func_entry_t __atexit_funcs[kAtExitMacDestructors]; uarch_t __atexit_func_count; /// @brief dynamic shared object Handle. -Kernel::UIntPtr __dso_handle; +NeOS::UIntPtr __dso_handle; -EXTERN_C Kernel::Void __cxa_pure_virtual(void* self) +EXTERN_C NeOS::Void __cxa_pure_virtual(void* self) { - kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self)); + kout << "object: " << NeOS::number(reinterpret_cast<NeOS::UIntPtr>(self)); kout << ", has unimplemented virtual functions.\r"; } diff --git a/dev/Kernel/src/CxxAbi-ARM64.cc b/dev/Kernel/src/CxxAbi-ARM64.cc index 797cfb9b..b52be160 100644 --- a/dev/Kernel/src/CxxAbi-ARM64.cc +++ b/dev/Kernel/src/CxxAbi-ARM64.cc @@ -15,7 +15,7 @@ atexit_func_entry_t __atexit_funcs[kAtExitMacDestructors]; uarch_t __atexit_func_count; /// @brief dynamic shared object Handle. -Kernel::UIntPtr __dso_handle; +NeOS::UIntPtr __dso_handle; EXTERN_C void __chkstk(void) { @@ -81,27 +81,27 @@ namespace cxxabiv1 } } // namespace cxxabiv1 -EXTERN_C Kernel::Void _purecall(void* self) +EXTERN_C NeOS::Void _purecall(void* self) { - kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self)); + kout << "object: " << NeOS::number(reinterpret_cast<NeOS::UIntPtr>(self)); kout << ", has unimplemented virtual functions.\r"; } -EXTERN_C Kernel::Void _Init_thread_footer(Kernel::Int* thread_obj) +EXTERN_C NeOS::Void _Init_thread_footer(NeOS::Int* thread_obj) { NE_UNUSED(thread_obj); } -EXTERN_C Kernel::Void _Init_thread_epoch(Kernel::Void) +EXTERN_C NeOS::Void _Init_thread_epoch(NeOS::Void) { NE_UNUSED(0); } -EXTERN_C Kernel::Void _Init_thread_header(Kernel::Int* thread_obj) +EXTERN_C NeOS::Void _Init_thread_header(NeOS::Int* thread_obj) { NE_UNUSED(0); } -EXTERN_C Kernel::Int _tls_index = 0UL; +EXTERN_C NeOS::Int _tls_index = 0UL; #endif // ifdef __NE_ARM64__ diff --git a/dev/Kernel/src/DriveMgr+IO.cc b/dev/Kernel/src/DriveMgr+IO.cc index d698b1b4..eb49d8f8 100644 --- a/dev/Kernel/src/DriveMgr+IO.cc +++ b/dev/Kernel/src/DriveMgr+IO.cc @@ -22,7 +22,7 @@ #define rtl_nefs_write(DRV, TRAITS, MP) (MP->DRV()).fOutput(TRAITS) #define rtl_nefs_read(DRV, TRAITS, MP) (MP->DRV()).fInput(TRAITS) -namespace Kernel +namespace NeOS { /// @brief Read from newfs disk. /// @param Mnt mounted interface. @@ -93,4 +93,4 @@ namespace Kernel return DrvTrait.fPacket.fPacketGood; } -} // namespace Kernel
\ No newline at end of file +} // namespace NeOS
\ No newline at end of file diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc index 62f57567..2989d85e 100644 --- a/dev/Kernel/src/DriveMgr.cc +++ b/dev/Kernel/src/DriveMgr.cc @@ -17,7 +17,7 @@ /// @brief Drive Manager of kernel. /***********************************************************************************/ -namespace Kernel +namespace NeOS { #if defined(__ATA_PIO__) || defined(__ATA_DMA__) STATIC UInt16 kATAIO = 0U; @@ -239,4 +239,4 @@ namespace Kernel return trait; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/FS/NeFS+FileMgr.cc b/dev/Kernel/src/FS/NeFS+FileMgr.cc index c7fdab14..0ac6384d 100644 --- a/dev/Kernel/src/FS/NeFS+FileMgr.cc +++ b/dev/Kernel/src/FS/NeFS+FileMgr.cc @@ -13,7 +13,7 @@ /// @brief NeFS File manager. /// BUGS: 0 -namespace Kernel +namespace NeOS { /// @brief C++ constructor NeFileSystemMgr::NeFileSystemMgr() @@ -239,7 +239,7 @@ namespace Kernel { return mParser; } -} // namespace Kernel +} // namespace NeOS #endif // ifdef __FSKIT_INCLUDES_NEFS__ #endif // ifndef __NE_MINIMAL_OS__ diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index 4a3370f5..0666149a 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -21,7 +21,7 @@ #include <KernelKit/User.h> #include <KernelKit/DriveMgr.h> -using namespace Kernel; +using namespace NeOS; #ifdef __NE_NO_BUILTIN__ /***********************************************************************************/ @@ -33,12 +33,12 @@ using namespace Kernel; /***********************************************************************************/ /// @brief get sector count. /***********************************************************************************/ -Kernel::SizeT drv_get_sector_count(); +NeOS::SizeT drv_get_sector_count(); /***********************************************************************************/ /// @brief get device size. /***********************************************************************************/ -Kernel::SizeT drv_get_size(); +NeOS::SizeT drv_get_size(); #endif @@ -328,7 +328,7 @@ _Output NEFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char if (drive.fPacket.fPacketReadOnly) return nullptr; - + NEFS_CATALOG_STRUCT* child_catalog = new NEFS_CATALOG_STRUCT(); child_catalog->ResourceForkSize = 0UL; @@ -1017,7 +1017,7 @@ SizeT NeFileSystemParser::Tell(_Input _Output NEFS_CATALOG_STRUCT* catalog) return 0; } -namespace Kernel::NeFS +namespace NeOS::NeFS { /***********************************************************************************/ /// @brief Construct NeFS drives. @@ -1032,6 +1032,6 @@ namespace Kernel::NeFS return true; } -} // namespace Kernel::NeFS +} // namespace NeOS::NeFS #endif // ifdef __FSKIT_INCLUDES_NEFS__ diff --git a/dev/Kernel/src/FileMgr.cc b/dev/Kernel/src/FileMgr.cc index 9708038a..b803253d 100644 --- a/dev/Kernel/src/FileMgr.cc +++ b/dev/Kernel/src/FileMgr.cc @@ -10,7 +10,7 @@ /// @file FileMgr.cc //! @brief File System Manager API. -namespace Kernel +namespace NeOS { STATIC IFilesystemMgr* kMountedFilesystem = nullptr; @@ -49,4 +49,4 @@ namespace Kernel return No; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/HardwareThreadScheduler.cc b/dev/Kernel/src/HardwareThreadScheduler.cc index e491e9c9..0ca09ddf 100644 --- a/dev/Kernel/src/HardwareThreadScheduler.cc +++ b/dev/Kernel/src/HardwareThreadScheduler.cc @@ -15,7 +15,7 @@ ///! @brief Multi processing is needed for multi-tasking operations. /***********************************************************************************/ -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @note Those symbols are needed in order to switch and validate the stack. @@ -222,4 +222,4 @@ namespace Kernel { return fThreadList.Count(); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/IDylibObject.cc b/dev/Kernel/src/IDylibObject.cc index 1448d60d..653aff76 100644 --- a/dev/Kernel/src/IDylibObject.cc +++ b/dev/Kernel/src/IDylibObject.cc @@ -12,4 +12,4 @@ #include <KernelKit/UserProcessScheduler.h> -using namespace Kernel; +using namespace NeOS; diff --git a/dev/Kernel/src/IPEFDylibObject.cc b/dev/Kernel/src/IPEFDylibObject.cc index fff74f32..935193f9 100644 --- a/dev/Kernel/src/IPEFDylibObject.cc +++ b/dev/Kernel/src/IPEFDylibObject.cc @@ -28,7 +28,7 @@ ------------------------------------------- */ -using namespace Kernel; +using namespace NeOS; /***********************************************************************************/ /// @file IPEFDylibObject.cc diff --git a/dev/Kernel/src/IndexableProperty.cc b/dev/Kernel/src/IndexableProperty.cc index c27e6124..166570e5 100644 --- a/dev/Kernel/src/IndexableProperty.cc +++ b/dev/Kernel/src/IndexableProperty.cc @@ -14,7 +14,7 @@ #define kMaxLenIndexer (256U) -namespace Kernel +namespace NeOS { namespace Indexer { @@ -54,4 +54,4 @@ namespace Kernel } } } // namespace Indexer -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Json.cc b/dev/Kernel/src/Json.cc index 2e0a1465..48567b5f 100644 --- a/dev/Kernel/src/Json.cc +++ b/dev/Kernel/src/Json.cc @@ -7,4 +7,4 @@ #include <NewKit/Json.h> /// @brief Undefined object, is null in length. -RTL_INIT_OBJECT(Kernel::Json::kNull, Kernel::Json); +RTL_INIT_OBJECT(NeOS::Json::kNull, NeOS::Json); diff --git a/dev/Kernel/src/KString.cc b/dev/Kernel/src/KString.cc index f37a16ad..717625a1 100644 --- a/dev/Kernel/src/KString.cc +++ b/dev/Kernel/src/KString.cc @@ -10,7 +10,7 @@ /// @file KString.cc /// @brief Kernel String manipulation file. -namespace Kernel +namespace NeOS { Char* KString::Data() { @@ -215,4 +215,4 @@ namespace Kernel return *this; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc index 30727a42..88fd51df 100644 --- a/dev/Kernel/src/KernelMain.cc +++ b/dev/Kernel/src/KernelMain.cc @@ -25,7 +25,7 @@ #include <KernelKit/Timer.h> #ifdef __NE_AUTO_FORMAT__ -namespace Kernel::Detail +namespace NeOS::Detail { /// @brief Filesystem auto formatter, additional checks are also done by the class. class NeFilesystemInstaller final @@ -87,17 +87,17 @@ namespace Kernel::Detail NE_COPY_DEFAULT(NeFilesystemInstaller); }; -} // namespace Kernel::Detail +} // namespace NeOS::Detail #endif // ifdef __NE_AUTO_FORMAT__ /// @brief Kernel entrypoint. /// @param Void /// @return Void -EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len) +EXTERN_C NeOS::Void rtl_kernel_main(NeOS::SizeT argc, char** argv, char** envp, NeOS::SizeT envp_len) { #ifdef __NE_AUTO_FORMAT__ - Kernel::NeFS::fs_init_nefs(); - Kernel::Detail::NeFilesystemInstaller installer{}; + NeOS::NeFS::fs_init_nefs(); + NeOS::Detail::NeFilesystemInstaller installer{}; #endif // __NE_AUTO_FORMAT__ while (YES) diff --git a/dev/Kernel/src/LPC.cc b/dev/Kernel/src/LPC.cc index 9dbaf825..b6b2e11b 100644 --- a/dev/Kernel/src/LPC.cc +++ b/dev/Kernel/src/LPC.cc @@ -7,7 +7,7 @@ #include <KernelKit/LPC.h> #include <NewKit/KernelPanic.h> -namespace Kernel +namespace NeOS { STATIC Bool kRaiseOnBugCheck = false; @@ -31,4 +31,4 @@ namespace Kernel { kRaiseOnBugCheck = true; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/LockDelegate.cc b/dev/Kernel/src/LockDelegate.cc index 4497ec83..df62c6f3 100644 --- a/dev/Kernel/src/LockDelegate.cc +++ b/dev/Kernel/src/LockDelegate.cc @@ -6,7 +6,7 @@ #include <KernelKit/LockDelegate.h> -namespace Kernel +namespace NeOS { /// @note Leave it empty for now. -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/MemoryMgr.cc b/dev/Kernel/src/MemoryMgr.cc index 989a4e95..ff148c85 100644 --- a/dev/Kernel/src/MemoryMgr.cc +++ b/dev/Kernel/src/MemoryMgr.cc @@ -27,7 +27,7 @@ #define kKernelHeapMagic (0xD4D75) #define kKernelHeapAlignSz (__BIGGEST_ALIGNMENT__) -namespace Kernel +namespace NeOS { /// @brief Contains data structures and algorithms for the heap. namespace Detail @@ -285,4 +285,4 @@ namespace Kernel return No; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Network/IPAddr.cc b/dev/Kernel/src/Network/IPAddr.cc index 090854bd..215ffcd2 100644 --- a/dev/Kernel/src/Network/IPAddr.cc +++ b/dev/Kernel/src/Network/IPAddr.cc @@ -7,7 +7,7 @@ #include <NetworkKit/IP.h> #include <NewKit/Utils.h> -namespace Kernel +namespace NeOS { char* RawIPAddress::Address() { @@ -126,4 +126,4 @@ namespace Kernel return true; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Network/IPCAddr.cc b/dev/Kernel/src/Network/IPCAddr.cc index 371e83d9..3acb2943 100644 --- a/dev/Kernel/src/Network/IPCAddr.cc +++ b/dev/Kernel/src/Network/IPCAddr.cc @@ -8,7 +8,7 @@ #include <KernelKit/LPC.h> #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { } diff --git a/dev/Kernel/src/Network/IPCMsg.cc b/dev/Kernel/src/Network/IPCMsg.cc index 46c96900..04f1114b 100644 --- a/dev/Kernel/src/Network/IPCMsg.cc +++ b/dev/Kernel/src/Network/IPCMsg.cc @@ -8,7 +8,7 @@ #include <KernelKit/LPC.h> #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /// @internal internal use for IPC system only. /// @brief The internal sanitize function. @@ -101,4 +101,4 @@ namespace Kernel return No; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Network/NetworkDevice.cc b/dev/Kernel/src/Network/NetworkDevice.cc index a3f1ce70..94d494da 100644 --- a/dev/Kernel/src/Network/NetworkDevice.cc +++ b/dev/Kernel/src/Network/NetworkDevice.cc @@ -7,7 +7,7 @@ #include <NetworkKit/NetworkDevice.h> #include <NewKit/Utils.h> -namespace Kernel +namespace NeOS { /// \brief Getter for fNetworkName. const Char* NetworkDevice::Name() const @@ -32,4 +32,4 @@ namespace Kernel return true; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/New+Delete.cc b/dev/Kernel/src/New+Delete.cc index bb98154e..1e0a3421 100644 --- a/dev/Kernel/src/New+Delete.cc +++ b/dev/Kernel/src/New+Delete.cc @@ -12,7 +12,7 @@ void* operator new[](size_t sz) if (sz == 0) ++sz; - return Kernel::mm_new_heap(sz, true, false); + return NeOS::mm_new_heap(sz, true, false); } void* operator new(size_t sz) @@ -20,7 +20,7 @@ void* operator new(size_t sz) if (sz == 0) ++sz; - return Kernel::mm_new_heap(sz, true, false); + return NeOS::mm_new_heap(sz, true, false); } void operator delete[](void* ptr) @@ -28,7 +28,7 @@ void operator delete[](void* ptr) if (ptr == nullptr) return; - Kernel::mm_delete_heap(ptr); + NeOS::mm_delete_heap(ptr); } void operator delete(void* ptr) @@ -36,7 +36,7 @@ void operator delete(void* ptr) if (ptr == nullptr) return; - Kernel::mm_delete_heap(ptr); + NeOS::mm_delete_heap(ptr); } void operator delete(void* ptr, size_t sz) @@ -46,5 +46,5 @@ void operator delete(void* ptr, size_t sz) NE_UNUSED(sz); - Kernel::mm_delete_heap(ptr); + NeOS::mm_delete_heap(ptr); } diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc index 53f83291..4be6afeb 100644 --- a/dev/Kernel/src/PEFCodeMgr.cc +++ b/dev/Kernel/src/PEFCodeMgr.cc @@ -18,7 +18,7 @@ #define kPefHeapSizeSymbol "__PEFSizeOfReserveHeap" #define kPefNameSymbol "__PEFProgramName" -namespace Kernel +namespace NeOS { namespace Detail { @@ -265,4 +265,4 @@ namespace Kernel return id; } } // namespace Utils -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/PRDT.cc b/dev/Kernel/src/PRDT.cc index 8836ec08..9ea3e70b 100644 --- a/dev/Kernel/src/PRDT.cc +++ b/dev/Kernel/src/PRDT.cc @@ -8,7 +8,7 @@ #include <NewKit/KString.h> #include <StorageKit/PRDT.h> -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief constructs a new PRD. @@ -21,4 +21,4 @@ namespace Kernel prd.Leak().fSectorCount = 0x0; prd.Leak().fEndBit = 0x0; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/PageMgr.cc b/dev/Kernel/src/PageMgr.cc index 1fc32ae0..eb7c7e03 100644 --- a/dev/Kernel/src/PageMgr.cc +++ b/dev/Kernel/src/PageMgr.cc @@ -13,7 +13,7 @@ #include <HALKit/ARM64/Paging.h> #endif // ifdef __NE_AMD64__ || defined(__NE_ARM64__) -namespace Kernel +namespace NeOS { PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) : fRw(Rw), @@ -60,7 +60,7 @@ namespace Kernel PTEWrapper PageMgr::Request(Boolean Rw, Boolean User, Boolean ExecDisable, SizeT Sz) { // Store PTE wrapper right after PTE. - VoidPtr ptr = Kernel::HAL::mm_alloc_bitmap(Rw, User, Sz, false); + VoidPtr ptr = NeOS::HAL::mm_alloc_bitmap(Rw, User, Sz, false); return PTEWrapper{Rw, User, ExecDisable, reinterpret_cast<UIntPtr>(ptr)}; } @@ -70,7 +70,7 @@ namespace Kernel /// @return If the page bitmap was cleared or not. Bool PageMgr::Free(Ref<PTEWrapper>& wrapper) { - if (!Kernel::HAL::mm_free_bitmap((VoidPtr)wrapper.Leak().VirtualAddress())) + if (!NeOS::HAL::mm_free_bitmap((VoidPtr)wrapper.Leak().VirtualAddress())) return false; return true; @@ -107,4 +107,4 @@ namespace Kernel { return fExecDisable; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Pmm.cc b/dev/Kernel/src/Pmm.cc index 08c700f3..b3d5e79e 100644 --- a/dev/Kernel/src/Pmm.cc +++ b/dev/Kernel/src/Pmm.cc @@ -15,7 +15,7 @@ #include <HALKit/AMD64/Processor.h> #endif // defined(__NE_AMD64__) -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Pmm constructor. @@ -95,4 +95,4 @@ namespace Kernel return true; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/Semaphore.cc b/dev/Kernel/src/Semaphore.cc index def49b51..20dd89e6 100644 --- a/dev/Kernel/src/Semaphore.cc +++ b/dev/Kernel/src/Semaphore.cc @@ -7,7 +7,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/Semaphore.h> -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Unlocks the semaphore. @@ -68,4 +68,4 @@ namespace Kernel while (fLockingProcess) ; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/SoftwareTimer.cc b/dev/Kernel/src/SoftwareTimer.cc index f83df762..5e4214e9 100644 --- a/dev/Kernel/src/SoftwareTimer.cc +++ b/dev/Kernel/src/SoftwareTimer.cc @@ -8,7 +8,7 @@ /// @brief SoftwareTimer class, meant to be generic. -using namespace Kernel; +using namespace NeOS; SoftwareTimer::SoftwareTimer(Int64 seconds) : fWaitFor(seconds) diff --git a/dev/Kernel/src/Storage/AHCIDeviceInterface.cc b/dev/Kernel/src/Storage/AHCIDeviceInterface.cc index fe45e1bf..a6f36731 100644 --- a/dev/Kernel/src/Storage/AHCIDeviceInterface.cc +++ b/dev/Kernel/src/Storage/AHCIDeviceInterface.cc @@ -6,7 +6,7 @@ #include <StorageKit/AHCI.h> -using namespace Kernel; +using namespace NeOS; /// @brief Class constructor /// @param Out Drive output diff --git a/dev/Kernel/src/Storage/ATADeviceInterface.cc b/dev/Kernel/src/Storage/ATADeviceInterface.cc index 99d67fd6..4223e9f9 100644 --- a/dev/Kernel/src/Storage/ATADeviceInterface.cc +++ b/dev/Kernel/src/Storage/ATADeviceInterface.cc @@ -6,7 +6,7 @@ #include <StorageKit/ATA.h> -using namespace Kernel; +using namespace NeOS; /// @brief Class constructor /// @param Out Drive output diff --git a/dev/Kernel/src/Storage/NVMEDeviceInterface.cc b/dev/Kernel/src/Storage/NVMEDeviceInterface.cc index ecef72b1..7884ce99 100644 --- a/dev/Kernel/src/Storage/NVMEDeviceInterface.cc +++ b/dev/Kernel/src/Storage/NVMEDeviceInterface.cc @@ -6,7 +6,7 @@ #include <StorageKit/NVME.h> -namespace Kernel +namespace NeOS { NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(MountpointInterface* outpacket), void (*in)(MountpointInterface* inpacket), @@ -25,4 +25,4 @@ namespace Kernel { return ("NVMEDeviceInterface"); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/System/SwapDisk.cc b/dev/Kernel/src/System/SwapDisk.cc index 590666e0..249b7172 100644 --- a/dev/Kernel/src/System/SwapDisk.cc +++ b/dev/Kernel/src/System/SwapDisk.cc @@ -7,7 +7,7 @@ #include <SystemKit/SwapDisk.h> #include <KernelKit/FileMgr.h> -namespace Kernel +namespace NeOS { BOOL SwapDisk::Write(const Char* fork_name, const SizeT fork_name_len, SWAP_DISK_HEADER_REF data, const SizeT data_len) { @@ -44,4 +44,4 @@ namespace Kernel return (SWAP_DISK_HEADER_REF)blob; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/ThreadLocalStorage.cc b/dev/Kernel/src/ThreadLocalStorage.cc index 6b62c316..9fef8d9f 100644 --- a/dev/Kernel/src/ThreadLocalStorage.cc +++ b/dev/Kernel/src/ThreadLocalStorage.cc @@ -18,7 +18,7 @@ /// @brief Process Thread Local Storage. /***********************************************************************************/ -using namespace Kernel; +using namespace NeOS; /** * @brief Checks for cookie inside the TIB. @@ -46,7 +46,7 @@ Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* tib_ptr) * @param tib_ptr The TIB record. * @return if the TIB record is valid or not. */ -EXTERN_C Bool tls_check_syscall_impl(Kernel::VoidPtr tib_ptr) noexcept +EXTERN_C Bool tls_check_syscall_impl(NeOS::VoidPtr tib_ptr) noexcept { if (!tib_ptr) { diff --git a/dev/Kernel/src/Timer.cc b/dev/Kernel/src/Timer.cc index df0f7518..5df81134 100644 --- a/dev/Kernel/src/Timer.cc +++ b/dev/Kernel/src/Timer.cc @@ -10,7 +10,7 @@ ///! @file Timer.cc ///! @brief Software Timer implementation -using namespace Kernel; +using namespace NeOS; /// @brief Unimplemented as it is an interface. BOOL TimerInterface::Wait() noexcept diff --git a/dev/Kernel/src/User.cc b/dev/Kernel/src/User.cc index e8ed9be6..0dfc410e 100644 --- a/dev/Kernel/src/User.cc +++ b/dev/Kernel/src/User.cc @@ -22,7 +22,7 @@ /// @file User.cc /// @brief User support. -namespace Kernel +namespace NeOS { namespace Detail { @@ -187,4 +187,4 @@ namespace Kernel { return this->Ring() == UserRingKind::kRingSuperUser; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/UserProcessScheduler.cc b/dev/Kernel/src/UserProcessScheduler.cc index 306ecdb8..83b39406 100644 --- a/dev/Kernel/src/UserProcessScheduler.cc +++ b/dev/Kernel/src/UserProcessScheduler.cc @@ -22,7 +22,7 @@ ///! BUGS: 0 -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Exit Code global variable. @@ -623,4 +623,4 @@ namespace Kernel { return mTeam.AsArray().Count() == 0; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/src/UserProcessTeam.cc b/dev/Kernel/src/UserProcessTeam.cc index a0a39054..e0533ef1 100644 --- a/dev/Kernel/src/UserProcessTeam.cc +++ b/dev/Kernel/src/UserProcessTeam.cc @@ -11,7 +11,7 @@ #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { UserProcessTeam::UserProcessTeam() { @@ -54,6 +54,6 @@ namespace Kernel { return this->mCurrentProcess; } -} // namespace Kernel +} // namespace NeOS // last rev 05-03-24 diff --git a/dev/Kernel/src/Utils.cc b/dev/Kernel/src/Utils.cc index 07090e91..a362099a 100644 --- a/dev/Kernel/src/Utils.cc +++ b/dev/Kernel/src/Utils.cc @@ -6,7 +6,7 @@ #include <NewKit/Utils.h> -namespace Kernel +namespace NeOS { Int32 rt_string_cmp(const Char* src, const Char* cmp, Size size) { @@ -210,15 +210,15 @@ namespace Kernel return str; } -} // namespace Kernel +} // namespace NeOS EXTERN_C void* memset(void* dst, int c, long long unsigned int len) { - return Kernel::rt_set_memory(dst, c, len); + return NeOS::rt_set_memory(dst, c, len); } EXTERN_C void* memcpy(void* dst, const void* src, long long unsigned int len) { - Kernel::rt_copy_memory(const_cast<void*>(src), dst, len); + NeOS::rt_copy_memory(const_cast<void*>(src), dst, len); return dst; } diff --git a/dev/Kernel/src/Variant.cc b/dev/Kernel/src/Variant.cc index 7a607a05..0a0eb02f 100644 --- a/dev/Kernel/src/Variant.cc +++ b/dev/Kernel/src/Variant.cc @@ -6,7 +6,7 @@ #include <NewKit/Variant.h> -namespace Kernel +namespace NeOS { const Char* Variant::ToString() { @@ -30,4 +30,4 @@ namespace Kernel { return fPtr; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Mod/ACPI/ACPI.h b/dev/Mod/ACPI/ACPI.h index 75c2ad9a..a4fe2b0e 100644 --- a/dev/Mod/ACPI/ACPI.h +++ b/dev/Mod/ACPI/ACPI.h @@ -13,9 +13,9 @@ #include <NewKit/Defines.h> -#define SDT_OBJECT : public Kernel::SDT +#define SDT_OBJECT : public NeOS::SDT -namespace Kernel +namespace NeOS { class PACKED SDT { @@ -85,6 +85,6 @@ namespace Kernel UInt32 CreatorRevision; UInt32 AddressArr[]; }; -} // namespace Kernel +} // namespace NeOS #endif // !__ACPI__ diff --git a/dev/Mod/ACPI/ACPIFactoryInterface.h b/dev/Mod/ACPI/ACPIFactoryInterface.h index 315e37d4..01143c17 100644 --- a/dev/Mod/ACPI/ACPIFactoryInterface.h +++ b/dev/Mod/ACPI/ACPIFactoryInterface.h @@ -13,7 +13,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { class ACPIFactoryInterface; @@ -55,6 +55,6 @@ namespace Kernel SSizeT fEntries{0UL}; // number of entries, -1 tells that no invalid entries were // found. }; -} // namespace Kernel +} // namespace NeOS #endif // !__MOD_ACPI_H__ diff --git a/dev/Mod/AHCI/AHCI.h b/dev/Mod/AHCI/AHCI.h index d895811c..3dbed7c2 100644 --- a/dev/Mod/AHCI/AHCI.h +++ b/dev/Mod/AHCI/AHCI.h @@ -53,172 +53,172 @@ enum typedef struct FisRegH2D final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_REG_H2D + NeOS::UInt8 FisType; // FIS_TYPE_REG_H2D - Kernel::UInt8 PortMul : 4; // Port multiplier - Kernel::UInt8 Reserved0 : 3; // Reserved - Kernel::UInt8 CmdOrCtrl : 1; // 1: Command, 0: Control + NeOS::UInt8 PortMul : 4; // Port multiplier + NeOS::UInt8 Reserved0 : 3; // Reserved + NeOS::UInt8 CmdOrCtrl : 1; // 1: Command, 0: Control - Kernel::UInt8 Command; // Command register - Kernel::UInt8 FeatureLow; // Feature register, 7:0 + NeOS::UInt8 Command; // Command register + NeOS::UInt8 FeatureLow; // Feature register, 7:0 // DWORD 1 - Kernel::UInt8 Lba0; // LBA low register, 7:0 - Kernel::UInt8 Lba1; // LBA mid register, 15:8 - Kernel::UInt8 Lba2; // LBA high register, 23:16 - Kernel::UInt8 Device; // Device register + NeOS::UInt8 Lba0; // LBA low register, 7:0 + NeOS::UInt8 Lba1; // LBA mid register, 15:8 + NeOS::UInt8 Lba2; // LBA high register, 23:16 + NeOS::UInt8 Device; // Device register // DWORD 2 - Kernel::UInt8 Lba3; // LBA register, 31:24 - Kernel::UInt8 Lba4; // LBA register, 39:32 - Kernel::UInt8 Lba5; // LBA register, 47:40 - Kernel::UInt8 FeatureHigh; // Feature register, 15:8 + NeOS::UInt8 Lba3; // LBA register, 31:24 + NeOS::UInt8 Lba4; // LBA register, 39:32 + NeOS::UInt8 Lba5; // LBA register, 47:40 + NeOS::UInt8 FeatureHigh; // Feature register, 15:8 // DWORD 3 - Kernel::UInt8 CountLow; // Count register, 7:0 - Kernel::UInt8 CountHigh; // Count register, 15:8 - Kernel::UInt8 Icc; // Isochronous command completion - Kernel::UInt8 Control; // Control register + NeOS::UInt8 CountLow; // Count register, 7:0 + NeOS::UInt8 CountHigh; // Count register, 15:8 + NeOS::UInt8 Icc; // Isochronous command completion + NeOS::UInt8 Control; // Control register // DWORD 4 - Kernel::UInt8 Reserved1[4]; // Reserved + NeOS::UInt8 Reserved1[4]; // Reserved } FisRegH2D; typedef struct FisRegD2H final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_REG_D2H + NeOS::UInt8 FisType; // FIS_TYPE_REG_D2H - Kernel::UInt8 PortMul : 4; // Port multiplier - Kernel::UInt8 Reserved0 : 2; // Reserved - Kernel::UInt8 IE : 1; // Interrupt bit - Kernel::UInt8 Reserved1 : 1; // Reserved + NeOS::UInt8 PortMul : 4; // Port multiplier + NeOS::UInt8 Reserved0 : 2; // Reserved + NeOS::UInt8 IE : 1; // Interrupt bit + NeOS::UInt8 Reserved1 : 1; // Reserved - Kernel::UInt8 Status; // Status register - Kernel::UInt8 Error; // Error register + NeOS::UInt8 Status; // Status register + NeOS::UInt8 Error; // Error register // DWORD 1 - Kernel::UInt8 Lba0; // LBA low register, 7:0 - Kernel::UInt8 Lba1; // LBA mid register, 15:8 - Kernel::UInt8 Lba2; // LBA high register, 23:16 - Kernel::UInt8 Device; // Device register + NeOS::UInt8 Lba0; // LBA low register, 7:0 + NeOS::UInt8 Lba1; // LBA mid register, 15:8 + NeOS::UInt8 Lba2; // LBA high register, 23:16 + NeOS::UInt8 Device; // Device register // DWORD 2 - Kernel::UInt8 Lba3; // LBA register, 31:24 - Kernel::UInt8 Lba4; // LBA register, 39:32 - Kernel::UInt8 Lba5; // LBA register, 47:40 - Kernel::UInt8 Rsv2; // Reserved + NeOS::UInt8 Lba3; // LBA register, 31:24 + NeOS::UInt8 Lba4; // LBA register, 39:32 + NeOS::UInt8 Lba5; // LBA register, 47:40 + NeOS::UInt8 Rsv2; // Reserved // DWORD 3 - Kernel::UInt8 CountLow; // Count register, 7:0 - Kernel::UInt8 CountHigh; // Count register, 15:8 - Kernel::UInt8 Rsv3[2]; // Reserved + NeOS::UInt8 CountLow; // Count register, 7:0 + NeOS::UInt8 CountHigh; // Count register, 15:8 + NeOS::UInt8 Rsv3[2]; // Reserved // DWORD 4 - Kernel::UInt8 Rsv4[4]; // Reserved + NeOS::UInt8 Rsv4[4]; // Reserved } FisRegD2H; typedef struct FisData final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_DATA + NeOS::UInt8 FisType; // FIS_TYPE_DATA - Kernel::UInt8 PortMul : 4; // Port multiplier - Kernel::UInt8 Reserved0 : 4; // Reserved + NeOS::UInt8 PortMul : 4; // Port multiplier + NeOS::UInt8 Reserved0 : 4; // Reserved - Kernel::UInt8 Reserved1[2]; // Reserved + NeOS::UInt8 Reserved1[2]; // Reserved // DWORD 1 ~ N - Kernel::UInt32 Data[1]; // Payload + NeOS::UInt32 Data[1]; // Payload } FisData; typedef struct FisPioSetup final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_PIO_SETUP + NeOS::UInt8 FisType; // FIS_TYPE_PIO_SETUP - Kernel::UInt8 PortMul : 4; // Port multiplier - Kernel::UInt8 Reserved0 : 1; // Reserved - Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host - Kernel::UInt8 IE : 1; // Interrupt bit - Kernel::UInt8 Reserved1 : 1; + NeOS::UInt8 PortMul : 4; // Port multiplier + NeOS::UInt8 Reserved0 : 1; // Reserved + NeOS::UInt8 DTD : 1; // Data transfer direction, 1 - device to host + NeOS::UInt8 IE : 1; // Interrupt bit + NeOS::UInt8 Reserved1 : 1; - Kernel::UInt8 Status; // Status register - Kernel::UInt8 Error; // Error register + NeOS::UInt8 Status; // Status register + NeOS::UInt8 Error; // Error register // DWORD 1 - Kernel::UInt8 Lba0; // LBA low register, 7:0 - Kernel::UInt8 Lba1; // LBA mid register, 15:8 - Kernel::UInt8 Lba2; // LBA high register, 23:16 - Kernel::UInt8 Device; // Device register + NeOS::UInt8 Lba0; // LBA low register, 7:0 + NeOS::UInt8 Lba1; // LBA mid register, 15:8 + NeOS::UInt8 Lba2; // LBA high register, 23:16 + NeOS::UInt8 Device; // Device register // DWORD 2 - Kernel::UInt8 Lba3; // LBA register, 31:24 - Kernel::UInt8 Lba4; // LBA register, 39:32 - Kernel::UInt8 Lba5; // LBA register, 47:40 - Kernel::UInt8 Rsv2; // Reserved + NeOS::UInt8 Lba3; // LBA register, 31:24 + NeOS::UInt8 Lba4; // LBA register, 39:32 + NeOS::UInt8 Lba5; // LBA register, 47:40 + NeOS::UInt8 Rsv2; // Reserved // DWORD 3 - Kernel::UInt8 CountLow; // Count register, 7:0 - Kernel::UInt8 CountHigh; // Count register, 15:8 - Kernel::UInt8 Rsv3; // Reserved - Kernel::UInt8 EStatus; // New value of status register + NeOS::UInt8 CountLow; // Count register, 7:0 + NeOS::UInt8 CountHigh; // Count register, 15:8 + NeOS::UInt8 Rsv3; // Reserved + NeOS::UInt8 EStatus; // New value of status register // DWORD 4 - Kernel::UInt16 TranferCount; // Transfer count - Kernel::UInt8 Rsv4[2]; // Reserved + NeOS::UInt16 TranferCount; // Transfer count + NeOS::UInt8 Rsv4[2]; // Reserved } FisPioSetup; typedef struct FisDmaSetup final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_DMA_SETUP + NeOS::UInt8 FisType; // FIS_TYPE_DMA_SETUP - Kernel::UInt8 PortMul : 4; // Port multiplier - Kernel::UInt8 Reserved0 : 1; // Reserved - Kernel::UInt8 DTD : 1; // Data transfer direction, 1 - device to host - Kernel::UInt8 IE : 1; // Interrupt bit - Kernel::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed + NeOS::UInt8 PortMul : 4; // Port multiplier + NeOS::UInt8 Reserved0 : 1; // Reserved + NeOS::UInt8 DTD : 1; // Data transfer direction, 1 - device to host + NeOS::UInt8 IE : 1; // Interrupt bit + NeOS::UInt8 AutoEnable : 1; // Auto-activate. Specifies if DMA Activate FIS is needed - Kernel::UInt8 Reserved1[2]; // Reserved + NeOS::UInt8 Reserved1[2]; // Reserved // DWORD 1&2 - volatile Kernel::UInt64 DmaBufferId; // DMA Buffer Identifier. Used to Identify DMA buffer in - // host memory. SATA Spec says host specific and not in - // Spec. Trying AHCI spec might work. + volatile NeOS::UInt64 DmaBufferId; // DMA Buffer Identifier. Used to Identify DMA buffer in + // host memory. SATA Spec says host specific and not in + // Spec. Trying AHCI spec might work. // DWORD 3 - Kernel::UInt32 Rsvd; // More reserved + NeOS::UInt32 Rsvd; // More reserved // DWORD 4 - Kernel::UInt32 DmabufOffset; // Byte offset into buffer. First 2 bits must be 0 + NeOS::UInt32 DmabufOffset; // Byte offset into buffer. First 2 bits must be 0 // DWORD 5 - Kernel::UInt32 TransferCount; // Number of bytes to transfer. Bit 0 must be 0 + NeOS::UInt32 TransferCount; // Number of bytes to transfer. Bit 0 must be 0 // DWORD 6 - Kernel::UInt32 Reserved3; // Reserved + NeOS::UInt32 Reserved3; // Reserved } FisDmaSetup; typedef struct FisDevBits final { // DWORD 0 - Kernel::UInt8 FisType; // FIS_TYPE_DMA_SETUP (A1h) + NeOS::UInt8 FisType; // FIS_TYPE_DMA_SETUP (A1h) - Kernel::UInt8 Reserved0 : 5; // Reserved - Kernel::UInt8 R0 : 1; - Kernel::UInt8 IE : 1; - Kernel::UInt8 N : 1; + NeOS::UInt8 Reserved0 : 5; // Reserved + NeOS::UInt8 R0 : 1; + NeOS::UInt8 IE : 1; + NeOS::UInt8 N : 1; - Kernel::UInt8 StatusLow : 3; - Kernel::UInt8 R1 : 1; - Kernel::UInt8 StatusHigh : 3; + NeOS::UInt8 StatusLow : 3; + NeOS::UInt8 R1 : 1; + NeOS::UInt8 StatusHigh : 3; - Kernel::UInt8 R2 : 1; - Kernel::UInt8 Error; + NeOS::UInt8 R2 : 1; + NeOS::UInt8 Error; // DWORD 1 - Kernel::UInt32 Act; + NeOS::UInt32 Act; } FisDevBits; /// \brief Enable AHCI device bit in GHC register. @@ -228,44 +228,44 @@ typedef struct FisDevBits final typedef struct HbaPort final { - Kernel::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned - Kernel::UInt32 Clbu; // 0x04, command list base address upper 32 bits - Kernel::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned - Kernel::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits - Kernel::UInt32 Is; // 0x10, interrupt status - Kernel::UInt32 Ie; // 0x14, interrupt enable - Kernel::UInt32 Cmd; // 0x18, command and status - Kernel::UInt32 Reserved0; // 0x1C, Reserved - Kernel::UInt32 Tfd; // 0x20, task file data - Kernel::UInt32 Sig; // 0x24, signature - Kernel::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus) - Kernel::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl) - Kernel::UInt32 Serr; // 0x30, SATA error (SCR1:SError) - Kernel::UInt32 Sact; // 0x34, SATA active (SCR3:SActive) - Kernel::UInt32 Ci; // 0x38, command issue - Kernel::UInt32 Sntf; // 0x3C, SATA notification (SCR4:SNotification) - Kernel::UInt32 Fbs; // 0x40, FIS-based switch control - Kernel::UInt32 Reserved1[11]; // 0x44 ~ 0x6F, Reserved - Kernel::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific + NeOS::UInt32 Clb; // 0x00, command list base address, 1K-byte aligned + NeOS::UInt32 Clbu; // 0x04, command list base address upper 32 bits + NeOS::UInt32 Fb; // 0x08, FIS base address, 256-byte aligned + NeOS::UInt32 Fbu; // 0x0C, FIS base address upper 32 bits + NeOS::UInt32 Is; // 0x10, interrupt status + NeOS::UInt32 Ie; // 0x14, interrupt enable + NeOS::UInt32 Cmd; // 0x18, command and status + NeOS::UInt32 Reserved0; // 0x1C, Reserved + NeOS::UInt32 Tfd; // 0x20, task file data + NeOS::UInt32 Sig; // 0x24, signature + NeOS::UInt32 Ssts; // 0x28, SATA status (SCR0:SStatus) + NeOS::UInt32 Sctl; // 0x2C, SATA control (SCR2:SControl) + NeOS::UInt32 Serr; // 0x30, SATA error (SCR1:SError) + NeOS::UInt32 Sact; // 0x34, SATA active (SCR3:SActive) + NeOS::UInt32 Ci; // 0x38, command issue + NeOS::UInt32 Sntf; // 0x3C, SATA notification (SCR4:SNotification) + NeOS::UInt32 Fbs; // 0x40, FIS-based switch control + NeOS::UInt32 Reserved1[11]; // 0x44 ~ 0x6F, Reserved + NeOS::UInt32 Vendor[4]; // 0x70 ~ 0x7F, vendor specific } HbaPort; typedef struct HbaMem final { // 0x00 - 0x2B, Generic Host Control - Kernel::UInt32 Cap; // 0x00, Host capability - Kernel::UInt32 Ghc; // 0x04, Global host control - Kernel::UInt32 Is; // 0x08, Interrupt status - Kernel::UInt32 Pi; // 0x0C, Port implemented - Kernel::UInt32 Vs; // 0x10, Version - Kernel::UInt32 Ccc_ctl; // 0x14, Command completion coalescing control - Kernel::UInt32 Ccc_pts; // 0x18, Command completion coalescing ports - Kernel::UInt32 Em_loc; // 0x1C, Enclosure management location - Kernel::UInt32 Em_ctl; // 0x20, Enclosure management control - Kernel::UInt32 Cap2; // 0x24, Host capabilities extended - Kernel::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status - - Kernel::UInt8 Resv0[0xA0 - 0x2C]; - Kernel::UInt8 Vendor[0x100 - 0xA0]; + NeOS::UInt32 Cap; // 0x00, Host capability + NeOS::UInt32 Ghc; // 0x04, Global host control + NeOS::UInt32 Is; // 0x08, Interrupt status + NeOS::UInt32 Pi; // 0x0C, Port implemented + NeOS::UInt32 Vs; // 0x10, Version + NeOS::UInt32 Ccc_ctl; // 0x14, Command completion coalescing control + NeOS::UInt32 Ccc_pts; // 0x18, Command completion coalescing ports + NeOS::UInt32 Em_loc; // 0x1C, Enclosure management location + NeOS::UInt32 Em_ctl; // 0x20, Enclosure management control + NeOS::UInt32 Cap2; // 0x24, Host capabilities extended + NeOS::UInt32 Bohc; // 0x28, BIOS/OS handoff control and status + + NeOS::UInt8 Resv0[0xA0 - 0x2C]; + NeOS::UInt8 Vendor[0x100 - 0xA0]; HbaPort Ports[32]; // 1 ~ 32, 32 is the max ahci devices per controller. } HbaMem; @@ -273,68 +273,68 @@ typedef struct HbaMem final typedef struct HbaCmdHeader final { // DW0 - Kernel::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16 - Kernel::UInt8 Atapi : 1; // ATAPI - Kernel::UInt8 Write : 1; // Write, 1: H2D, 0: D2H - Kernel::UInt8 Prefetchable : 1; // Prefetchable - - Kernel::UInt8 Reset : 1; // Reset - Kernel::UInt8 BIST : 1; // BIST - Kernel::UInt8 Clear : 1; // Clear busy upon R_OK - Kernel::UInt8 Reserved0 : 1; // Reserved - Kernel::UInt8 Pmp : 4; // Port multiplier port - - Kernel::UInt16 Prdtl; // Physical region descriptor table length in entries - volatile Kernel::UInt32 Prdbc; // Physical region descriptor byte count transferred - - Kernel::UInt32 Ctba; // Command table descriptor base address - Kernel::UInt32 Ctbau; // Command table descriptor base address upper 32 bits + NeOS::UInt8 Cfl : 5; // Command FIS length in DWORDS, 2 ~ 16 + NeOS::UInt8 Atapi : 1; // ATAPI + NeOS::UInt8 Write : 1; // Write, 1: H2D, 0: D2H + NeOS::UInt8 Prefetchable : 1; // Prefetchable + + NeOS::UInt8 Reset : 1; // Reset + NeOS::UInt8 BIST : 1; // BIST + NeOS::UInt8 Clear : 1; // Clear busy upon R_OK + NeOS::UInt8 Reserved0 : 1; // Reserved + NeOS::UInt8 Pmp : 4; // Port multiplier port + + NeOS::UInt16 Prdtl; // Physical region descriptor table length in entries + volatile NeOS::UInt32 Prdbc; // Physical region descriptor byte count transferred + + NeOS::UInt32 Ctba; // Command table descriptor base address + NeOS::UInt32 Ctbau; // Command table descriptor base address upper 32 bits } HbaCmdHeader; typedef struct HbaFis final { // 0x00 - FisDmaSetup Dsfis; // DMA Setup FIS - Kernel::UInt8 Pad0[4]; + FisDmaSetup Dsfis; // DMA Setup FIS + NeOS::UInt8 Pad0[4]; // 0x20 - FisPioSetup Psfis; // PIO Setup FIS - Kernel::UInt8 Pad1[12]; + FisPioSetup Psfis; // PIO Setup FIS + NeOS::UInt8 Pad1[12]; // 0x40 - FisRegD2H Rfis; // Register – Device to Host FIS - Kernel::UInt8 Pad2[4]; + FisRegD2H Rfis; // Register – Device to Host FIS + NeOS::UInt8 Pad2[4]; // 0x58 FisDevBits Sdbfis; // Set Device Bit FIS // 0x60 - Kernel::UInt8 Ufis[64]; + NeOS::UInt8 Ufis[64]; // 0xA0 - Kernel::UInt8 Rsv[0x100 - 0xA0]; + NeOS::UInt8 Rsv[0x100 - 0xA0]; } HbaFis; typedef struct HbaPrdtEntry final { - Kernel::UInt32 Dba; // Data base address - Kernel::UInt32 Dbau; // Data base address upper 32 bits - Kernel::UInt32 Reserved0; // Reserved + NeOS::UInt32 Dba; // Data base address + NeOS::UInt32 Dbau; // Data base address upper 32 bits + NeOS::UInt32 Reserved0; // Reserved // DW3 - Kernel::UInt32 Dbc : 22; // Byte count, 4M max - Kernel::UInt32 Reserved1 : 9; // Reserved - Kernel::UInt32 Ie : 1; // Interrupt on completion + NeOS::UInt32 Dbc : 22; // Byte count, 4M max + NeOS::UInt32 Reserved1 : 9; // Reserved + NeOS::UInt32 Ie : 1; // Interrupt on completion } HbaPrdtEntry; typedef struct HbaCmdTbl final { - Kernel::UInt8 Cfis[64]; // Command FIS - Kernel::UInt8 Acmd[16]; // ATAPI command, 12 or 16 bytes - Kernel::UInt8 Rsv[48]; // Reserved + NeOS::UInt8 Cfis[64]; // Command FIS + NeOS::UInt8 Acmd[16]; // ATAPI command, 12 or 16 bytes + NeOS::UInt8 Rsv[48]; // Reserved struct HbaPrdtEntry Prdt[]; // Physical region descriptor table entries, 0 ~ 65535 } HbaCmdTbl; /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of port that have been detected. /// @return -Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented); +NeOS::Boolean drv_std_init(NeOS::UInt16& PortsImplemented); -Kernel::Boolean drv_std_detected(Kernel::Void); +NeOS::Boolean drv_std_detected(NeOS::Void); /// @brief Read from AHCI disk. /// @param lba @@ -342,7 +342,7 @@ Kernel::Boolean drv_std_detected(Kernel::Void); /// @param sector_sz /// @param buf_sz /// @return -Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::Char* buf, Kernel::SizeT sector_sz, Kernel::SizeT buf_sz); +NeOS::Void drv_std_read(NeOS::UInt64 lba, NeOS::Char* buf, NeOS::SizeT sector_sz, NeOS::SizeT buf_sz); /// @brief Write to AHCI disk. /// @param lba @@ -350,13 +350,13 @@ Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::Char* buf, Kernel::SizeT s /// @param sector_sz /// @param buf_sz /// @return -Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buf, Kernel::SizeT sector_sz, Kernel::SizeT buf_sz); +NeOS::Void drv_std_write(NeOS::UInt64 lba, NeOS::Char* buf, NeOS::SizeT sector_sz, NeOS::SizeT buf_sz); /// @brief Gets the sector count from AHCI disk. -Kernel::SizeT drv_get_sector_count(); +NeOS::SizeT drv_get_sector_count(); /// @brief Gets the AHCI disk size. -Kernel::SizeT drv_get_size(); +NeOS::SizeT drv_get_size(); /// @brief Checks if the drive has completed the command. BOOL drv_is_ready(void); diff --git a/dev/Mod/APM/APM.h b/dev/Mod/APM/APM.h index 2e6bdccd..1cb55fdc 100644 --- a/dev/Mod/APM/APM.h +++ b/dev/Mod/APM/APM.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h>
-namespace Kernel
+namespace NeOS
{
typedef Int32 APMPowerCmd;
@@ -34,4 +34,4 @@ namespace Kernel /// @param cmd the command.
/// @return status code.
EXTERN_C Int32 apm_send_io_command(UInt16 cmd, APMPowerCmd value);
-} // namespace Kernel
+} // namespace NeOS
diff --git a/dev/Mod/ATA/ATA.h b/dev/Mod/ATA/ATA.h index 8fdd3150..374b8b5d 100644 --- a/dev/Mod/ATA/ATA.h +++ b/dev/Mod/ATA/ATA.h @@ -134,22 +134,22 @@ enum #if defined(__ATA_PIO__) || defined(__ATA_DMA__) -Kernel::Boolean drv_std_init(Kernel::UInt16 in_bus, Kernel::UInt8 drive, Kernel::UInt16& out_bus, Kernel::UInt8& out_master); +NeOS::Boolean drv_std_init(NeOS::UInt16 in_bus, NeOS::UInt8 drive, NeOS::UInt16& out_bus, NeOS::UInt8& out_master); -Kernel::Boolean drv_std_detected(Kernel::Void); +NeOS::Boolean drv_std_detected(NeOS::Void); -Kernel::Void drv_std_select(Kernel::UInt16 bus); +NeOS::Void drv_std_select(NeOS::UInt16 bus); -Kernel::Boolean drv_std_wait_io(Kernel::UInt16 io); +NeOS::Boolean drv_std_wait_io(NeOS::UInt16 io); -Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::UInt16 io, Kernel::UInt8 is_master, Kernel::Char* buf, Kernel::SizeT sec_sz, Kernel::SizeT buf_sz); +NeOS::Void drv_std_read(NeOS::UInt64 lba, NeOS::UInt16 io, NeOS::UInt8 is_master, NeOS::Char* buf, NeOS::SizeT sec_sz, NeOS::SizeT buf_sz); -Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::UInt16 io, Kernel::UInt8 is_master, Kernel::Char* buf, Kernel::SizeT sec_sz, Kernel::SizeT buf_sz); +NeOS::Void drv_std_write(NeOS::UInt64 lba, NeOS::UInt16 io, NeOS::UInt8 is_master, NeOS::Char* buf, NeOS::SizeT sec_sz, NeOS::SizeT buf_sz); /// @brief get sector count. -Kernel::SizeT drv_get_sector_count(); +NeOS::SizeT drv_get_sector_count(); /// @brief get device size. -Kernel::SizeT drv_get_size(); +NeOS::SizeT drv_get_size(); #endif // ifdef __NEOSKRNL__
\ No newline at end of file diff --git a/dev/Mod/CoreGfx/AccessibilityMgr.h b/dev/Mod/CoreGfx/AccessibilityMgr.h index 6916984b..58054a89 100644 --- a/dev/Mod/CoreGfx/AccessibilityMgr.h +++ b/dev/Mod/CoreGfx/AccessibilityMgr.h @@ -15,7 +15,7 @@ namespace FB { - using namespace Kernel; + using namespace NeOS; /// @brief common User interface class. class UIAccessibilty final diff --git a/dev/Mod/CoreGfx/FBMgr.h b/dev/Mod/CoreGfx/FBMgr.h index cd4d0c30..57a781ad 100644 --- a/dev/Mod/CoreGfx/FBMgr.h +++ b/dev/Mod/CoreGfx/FBMgr.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -#define fb_init() Kernel::SizeT kCGCursor = 0 +#define fb_init() NeOS::SizeT kCGCursor = 0 #define fb_color(R, G, B) RGB(R, G, B) @@ -18,99 +18,99 @@ #ifdef __NE_AMD64__ /// @brief Performs Alpha drawing on the framebuffer. -#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ - { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ - { \ - *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) |= (reg_ptr)[kCGCursor]; \ - \ - ++kCGCursor; \ - } \ +#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) \ + for (NeOS::SizeT i = base_x; i < (width + base_x); ++i) \ + { \ + for (NeOS::SizeT u = base_y; u < (height + base_y); ++u) \ + { \ + *(((NeOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) |= (reg_ptr)[kCGCursor]; \ + \ + ++kCGCursor; \ + } \ } /// @brief Performs drawing on the framebuffer. -#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ - { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ - { \ - *(((Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = (reg_ptr)[kCGCursor]; \ - \ - ++kCGCursor; \ - } \ +#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) \ + for (NeOS::SizeT i = base_x; i < (width + base_x); ++i) \ + { \ + for (NeOS::SizeT u = base_y; u < (height + base_y); ++u) \ + { \ + *(((NeOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = (reg_ptr)[kCGCursor]; \ + \ + ++kCGCursor; \ + } \ } #define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ + for (NeOS::SizeT i = base_x; i < (width + base_x); ++i) \ { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ + for (NeOS::SizeT u = base_y; u < (height + base_y); ++u) \ { \ - *(((Kernel::UInt32*)(_Rgn + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = (reg_ptr)[kCGCursor]; \ + *(((NeOS::UInt32*)(_Rgn + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = (reg_ptr)[kCGCursor]; \ \ ++kCGCursor; \ } \ } /// @brief Cleans a resource. -#define CGClearRegion(height, width, base_x, base_y) \ - for (Kernel::SizeT i = base_x; i < (width + base_x); ++i) \ - { \ - for (Kernel::SizeT u = base_y; u < (height + base_y); ++u) \ - { \ - *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - i + \ - 4 * u))) = fb_get_clear_clr(); \ - } \ +#define CGClearRegion(height, width, base_x, base_y) \ + for (NeOS::SizeT i = base_x; i < (width + base_x); ++i) \ + { \ + for (NeOS::SizeT u = base_y; u < (height + base_y); ++u) \ + { \ + *(((volatile NeOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + i + \ + 4 * u))) = fb_get_clear_clr(); \ + } \ } /// @brief Draws inside a zone. -#define FBDrawInRegion(_Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ - { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ - { \ - *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - x_base + \ - 4 * y_base))) = _Clr; \ - } \ +#define FBDrawInRegion(_Clr, height, width, base_x, base_y) \ + for (NeOS::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + { \ + for (NeOS::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + { \ + *(((volatile NeOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + x_base + \ + 4 * y_base))) = _Clr; \ + } \ } /// @brief Draws inside a zone. -#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ - { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ - { \ - *(((volatile Kernel::UInt32*)(_Rgn + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - x_base + \ - 4 * y_base))) = _Clr[kCGCursor]; \ - ++kCGCursor; \ - } \ +#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) \ + for (NeOS::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + { \ + for (NeOS::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + { \ + *(((volatile NeOS::UInt32*)(_Rgn + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + x_base + \ + 4 * y_base))) = _Clr[kCGCursor]; \ + ++kCGCursor; \ + } \ } -#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) \ - for (Kernel::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ - { \ - for (Kernel::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ - { \ - *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - x_base + \ - 4 * y_base))) |= _Clr; \ - } \ +#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) \ + for (NeOS::SizeT x_base = base_x; x_base < (width + base_x); ++x_base) \ + { \ + for (NeOS::SizeT y_base = base_y; y_base < (height + base_y); ++y_base) \ + { \ + *(((volatile NeOS::UInt32*)(kHandoverHeader->f_GOP.f_The + \ + 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ + x_base + \ + 4 * y_base))) |= _Clr; \ + } \ } #else #define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) diff --git a/dev/Mod/CoreGfx/TextMgr.h b/dev/Mod/CoreGfx/TextMgr.h index 27b182ee..a3c1af24 100644 --- a/dev/Mod/CoreGfx/TextMgr.h +++ b/dev/Mod/CoreGfx/TextMgr.h @@ -13,7 +13,7 @@ #define kFontSizeY 8
#define kFontNOFChars 128
-inline const Kernel::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = {
+inline const NeOS::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = {
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0000 (nul)
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0001
{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0002
@@ -145,10 +145,10 @@ inline const Kernel::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = { };
-inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap, const Kernel::SizeT& x_sz, const Kernel::SizeT& y_sz, Kernel::Int32& x_dst, Kernel::Int32& y_dst, Kernel::Int32& color)
+inline NeOS::Void fb_render_string_for_bitmap(const NeOS::UInt8* bitmap, const NeOS::SizeT& x_sz, const NeOS::SizeT& y_sz, NeOS::Int32& x_dst, NeOS::Int32& y_dst, NeOS::Int32& color)
{
- Kernel::Int32 x, y;
- Kernel::Int32 set;
+ NeOS::Int32 x, y;
+ NeOS::Int32 set;
x = 0;
y = 0;
@@ -168,9 +168,9 @@ inline Kernel::Void fb_render_string_for_bitmap(const Kernel::UInt8* bitmap, con }
}
-inline Kernel::Void fb_render_string(const Kernel::Char* text, Kernel::Int32 x_dst, Kernel::Int32 y_dst, Kernel::Int32 color)
+inline NeOS::Void fb_render_string(const NeOS::Char* text, NeOS::Int32 x_dst, NeOS::Int32 y_dst, NeOS::Int32 color)
{
- for (Kernel::SizeT i = 0; text[i] != 0; ++i)
+ for (NeOS::SizeT i = 0; text[i] != 0; ++i)
{
fb_render_string_for_bitmap(&kFontBitmap[text[i]][0], kFontSizeX, kFontSizeY, x_dst, y_dst, color);
y_dst += kFontSizeY;
diff --git a/dev/Mod/HPET/Defines.h b/dev/Mod/HPET/Defines.h index fb672410..c916703a 100644 --- a/dev/Mod/HPET/Defines.h +++ b/dev/Mod/HPET/Defines.h @@ -14,29 +14,29 @@ #include <NewKit/Defines.h> #include <Mod/ACPI/ACPI.h> -namespace Kernel +namespace NeOS { struct PACKED HPETAddressStructure final { - Kernel::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O - Kernel::UInt8 RegisterBitWidth; - Kernel::UInt8 RegisterBitOffset; - Kernel::UInt8 Reserved; - Kernel::UInt64 Address; + NeOS::UInt8 AddressSpaceId; // 0 - system memory, 1 - system I/O + NeOS::UInt8 RegisterBitWidth; + NeOS::UInt8 RegisterBitOffset; + NeOS::UInt8 Reserved; + NeOS::UInt64 Address; }; struct PACKED HPETHeader final : public SDT { - Kernel::UInt8 HardwareRevId; - Kernel::UInt8 ComparatorCount : 5; - Kernel::UInt8 CounterSize : 1; - Kernel::UInt8 Reserved : 1; - Kernel::UInt8 LegacyReplacement : 1; - Kernel::UInt16 PciVendorId; + NeOS::UInt8 HardwareRevId; + NeOS::UInt8 ComparatorCount : 5; + NeOS::UInt8 CounterSize : 1; + NeOS::UInt8 Reserved : 1; + NeOS::UInt8 LegacyReplacement : 1; + NeOS::UInt16 PciVendorId; HPETAddressStructure Address; - Kernel::UInt8 HpetNumber; - Kernel::UInt16 MinimumTick; - Kernel::UInt8 PageProtection; + NeOS::UInt8 HpetNumber; + NeOS::UInt16 MinimumTick; + NeOS::UInt8 PageProtection; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Mod/LTE/LTE.h b/dev/Mod/LTE/LTE.h index 32a7748d..ef7d49f3 100644 --- a/dev/Mod/LTE/LTE.h +++ b/dev/Mod/LTE/LTE.h @@ -16,25 +16,25 @@ Purpose: LTE Standard Library. /// @brief Long Term Evolution I/O routines.
/// @brief Turn on SIM slot.
-Kernel::Boolean lte_turn_on_sim(Kernel::Int32 simSlot);
+NeOS::Boolean lte_turn_on_sim(NeOS::Int32 simSlot);
/// @brief Turn off SIM slot.
-Kernel::Boolean lte_turn_off_sim(Kernel::Int32 simSlot);
+NeOS::Boolean lte_turn_off_sim(NeOS::Int32 simSlot);
/// @brief Send AT command.
-Kernel::Boolean lte_send_at_command(Kernel::Char* buf,
- Kernel::Size bufReadSz,
- Kernel::Int32 simSlot);
-
-Kernel::Boolean lte_write_sim_file(Kernel::Char* file,
- Kernel::VoidPtr buf,
- Kernel::Size bufSz,
- Kernel::Size offset,
- Kernel::Int32 simSlot);
-
-Kernel::VoidPtr lte_read_sim_file(Kernel::Char* file,
- Kernel::Size bufSz,
- Kernel::Size offset,
- Kernel::Int32 simSlot);
+NeOS::Boolean lte_send_at_command(NeOS::Char* buf,
+ NeOS::Size bufReadSz,
+ NeOS::Int32 simSlot);
+
+NeOS::Boolean lte_write_sim_file(NeOS::Char* file,
+ NeOS::VoidPtr buf,
+ NeOS::Size bufSz,
+ NeOS::Size offset,
+ NeOS::Int32 simSlot);
+
+NeOS::VoidPtr lte_read_sim_file(NeOS::Char* file,
+ NeOS::Size bufSz,
+ NeOS::Size offset,
+ NeOS::Int32 simSlot);
#endif // ifndef _INC_NETWORK_LTE_H_
diff --git a/dev/Mod/MBCI/MBCI.h b/dev/Mod/MBCI/MBCI.h index c9ce73fb..d20f7934 100644 --- a/dev/Mod/MBCI/MBCI.h +++ b/dev/Mod/MBCI/MBCI.h @@ -23,7 +23,7 @@ #define kMBCIZeroSz (8) -namespace Kernel +namespace NeOS { struct IMBCIHost; @@ -95,6 +95,6 @@ namespace Kernel /// @brief An AuthKey is a context used to decrpy data from an MBCI packet. typedef UInt64 MBCIAuthKeyType; -} // namespace Kernel +} // namespace NeOS #endif // ifndef _INC_MODULE_MBCI_H_ diff --git a/dev/Mod/MFlash/MFlash.h b/dev/Mod/MFlash/MFlash.h index 992c945b..02a74666 100644 --- a/dev/Mod/MFlash/MFlash.h +++ b/dev/Mod/MFlash/MFlash.h @@ -10,12 +10,12 @@ #include <NewKit/Defines.h> -Kernel::SizeT drv_get_sector_count(Kernel::Int32 slot); +NeOS::SizeT drv_get_sector_count(NeOS::Int32 slot); -Kernel::SizeT drv_get_size(Kernel::Int32 slot); +NeOS::SizeT drv_get_size(NeOS::Int32 slot); -Kernel::Void drv_enable_at(Kernel::Int32 slot); +NeOS::Void drv_enable_at(NeOS::Int32 slot); -Kernel::Void drv_disable_at(Kernel::Int32 slot); +NeOS::Void drv_disable_at(NeOS::Int32 slot); #endif // ifdef NE_USE_MBCI_FLASH diff --git a/dev/Mod/NVME/NVME.h b/dev/Mod/NVME/NVME.h index 236925d1..c73b8af5 100644 --- a/dev/Mod/NVME/NVME.h +++ b/dev/Mod/NVME/NVME.h @@ -17,9 +17,9 @@ /// @file NVME.h /// @brief NVME driver. -#define NE_ALIGN_NVME ATTRIBUTE(aligned(sizeof(Kernel::UInt32))) +#define NE_ALIGN_NVME ATTRIBUTE(aligned(sizeof(NeOS::UInt32))) -namespace Kernel +namespace NeOS { struct NE_ALIGN_NVME HAL_NVME_BAR_0 final { @@ -104,10 +104,8 @@ namespace Kernel } } - // Use (1 << 0) as contigunous is better supported. - return true; } -} // namespace Kernel +} // namespace NeOS #endif // ifndef __MODULE_NVME_H__ diff --git a/dev/Mod/SCSI/SCSI.h b/dev/Mod/SCSI/SCSI.h index 1bcabc1e..156bec90 100644 --- a/dev/Mod/SCSI/SCSI.h +++ b/dev/Mod/SCSI/SCSI.h @@ -12,4 +12,4 @@ /// @brief Serial SCSI driver. template <int PacketBitLen> -using scsi_packet_type = Kernel::UInt16[PacketBitLen]; +using scsi_packet_type = NeOS::UInt16[PacketBitLen]; diff --git a/dev/Mod/XHCI/Defines.h b/dev/Mod/XHCI/Defines.h index 345b5157..e3fcce11 100644 --- a/dev/Mod/XHCI/Defines.h +++ b/dev/Mod/XHCI/Defines.h @@ -16,7 +16,7 @@ #include <NewKit/Defines.h> -using namespace Kernel; +using namespace NeOS; #define kUSBCommand (UInt16)0x0 #define kUSBStatus (UInt16)0x2 |