diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
| commit | ba7b3ed69cd24970a28b72c54982735cd120e663 (patch) | |
| tree | 934b7645435ab1bfd2d8eb99fa861fc09e3dd5b4 /dev/kernel | |
| parent | 2205e801a6e84238dc8cbbb8f9de5a675eae1d81 (diff) | |
kernel: breaking: Change namespace from NeOS to Kernel.
sched: Fix redundancy in NeKernel's user scheduler macros, refactored
the other files using the redundant macros too.
part one of a series of commit for NeKernel.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel')
172 files changed, 710 insertions, 782 deletions
diff --git a/dev/kernel/ArchKit/ArchKit.h b/dev/kernel/ArchKit/ArchKit.h index 04fc5bf6..76e62a4e 100644 --- a/dev/kernel/ArchKit/ArchKit.h +++ b/dev/kernel/ArchKit/ArchKit.h @@ -28,7 +28,7 @@ #define kKernelMaxSystemCalls (512U) -namespace NeOS +namespace Kernel { inline SSizeT rt_hash_seed(const Char* seed, int mul) { @@ -67,14 +67,14 @@ namespace NeOS { auto mm_is_bitmap(VoidPtr ptr) -> Bool; } -} // namespace NeOS +} // namespace Kernel -typedef NeOS::Void (*rt_syscall_proc)(NeOS::VoidPtr); +typedef Kernel::Void (*rt_syscall_proc)(Kernel::VoidPtr); struct HalSyscallEntry final { - NeOS::Int64 fHash; - NeOS::Bool fHooked; + Kernel::Int64 fHash; + Kernel::Bool fHooked; rt_syscall_proc fProc; operator bool() @@ -83,12 +83,12 @@ struct HalSyscallEntry final } }; -inline NeOS::Array<HalSyscallEntry, +inline Kernel::Array<HalSyscallEntry, kKernelMaxSystemCalls> kSyscalls; -inline NeOS::Array<HalSyscallEntry, +inline Kernel::Array<HalSyscallEntry, kKernelMaxSystemCalls> kKerncalls; -EXTERN_C NeOS::HAL::StackFramePtr mp_get_current_context(NeOS::Int64 pid); +EXTERN_C Kernel::HAL::StackFramePtr mp_get_current_context(Kernel::Int64 pid); diff --git a/dev/kernel/CFKit/GUIDWizard.h b/dev/kernel/CFKit/GUIDWizard.h index 5236688f..45572d32 100644 --- a/dev/kernel/CFKit/GUIDWizard.h +++ b/dev/kernel/CFKit/GUIDWizard.h @@ -17,8 +17,8 @@ namespace CFKit::XRN::Version1 { - using namespace NeOS; + using namespace Kernel; Ref<GUIDSequence*> cf_make_sequence(const ArrayList<UInt32>& seq); - ErrorOr<Ref<NeOS::KString>> cf_try_guid_to_string(Ref<GUIDSequence*>& guid); + ErrorOr<Ref<Kernel::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 3b7ada6d..68c43033 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 NeOS; + using namespace Kernel; union GUIDSequence { alignas(8) UShort u8[16]; diff --git a/dev/kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h index e4588ad6..b43434f6 100644 --- a/dev/kernel/CFKit/Property.h +++ b/dev/kernel/CFKit/Property.h @@ -17,7 +17,7 @@ namespace CFKit { - using namespace NeOS; + using namespace Kernel; /// @brief handle to anything (number, ptr, string...) using PropertyId = UIntPtr; @@ -48,7 +48,7 @@ namespace CFKit using PropertyArray = Array<Property, N>; } // namespace CFKit -namespace NeOS +namespace Kernel { using namespace CFKit; } diff --git a/dev/kernel/CFKit/Utils.h b/dev/kernel/CFKit/Utils.h index b8f16164..1de15c18 100644 --- a/dev/kernel/CFKit/Utils.h +++ b/dev/kernel/CFKit/Utils.h @@ -6,7 +6,7 @@ namespace CFKit { - using namespace NeOS; + using namespace Kernel; /// @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/HeFS.h b/dev/kernel/FSKit/HeFS.h index 5643c94e..cd547afb 100644 --- a/dev/kernel/FSKit/HeFS.h +++ b/dev/kernel/FSKit/HeFS.h @@ -34,26 +34,26 @@ struct HeFS_BOOT_NODE; struct HeFS_BOOT_NODE final
{
- NeOS::Char fMagic[kHeFSMagicLen];
- NeOS::Char fPartName[kHeFSPartNameLen];
- 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;
+ Kernel::Char fMagic[kHeFSMagicLen];
+ Kernel::Char fPartName[kHeFSPartNameLen];
+ Kernel::UInt32 fVersion;
+ Kernel::UInt64 fBadSectors;
+ Kernel::UInt64 fSectorCount;
+ Kernel::UInt64 fSectorSize;
+ Kernel::UInt32 fChecksum;
+ Kernel::UInt8 fDriveKind;
+ Kernel::UInt8 fTextEncoding;
+ Kernel::UInt64 fRootINode;
+ Kernel::UInt64 fRecoveryINode;
};
struct HeFS_INDEX_NODE
{
- NeOS::Char fName[kHeFSFileNameLen];
- NeOS::UInt32 fFlags;
- NeOS::UInt16 fKind;
- NeOS::UInt32 fSize;
- NeOS::Lba fFirstINode;
- NeOS::Lba fLastINode;
- NeOS::UInt32 fChecksum;
+ Kernel::Char fName[kHeFSFileNameLen];
+ Kernel::UInt32 fFlags;
+ Kernel::UInt16 fKind;
+ Kernel::UInt32 fSize;
+ Kernel::Lba fFirstINode;
+ Kernel::Lba fLastINode;
+ Kernel::UInt32 fChecksum;
};
\ No newline at end of file diff --git a/dev/kernel/FSKit/IndexableProperty.h b/dev/kernel/FSKit/IndexableProperty.h index 054b2433..9c9f272c 100644 --- a/dev/kernel/FSKit/IndexableProperty.h +++ b/dev/kernel/FSKit/IndexableProperty.h @@ -13,7 +13,7 @@ #define kIndexerCatalogNameLength 256U #define kIndexerClaimed 0xCF -namespace NeOS +namespace Kernel { namespace Indexer { @@ -30,7 +30,7 @@ namespace NeOS explicit IndexableProperty() : Property() { - NeOS::KString strProp(kMaxPropLen); + Kernel::KString strProp(kMaxPropLen); strProp += "/prop/indexable"; this->GetKey() = strProp; @@ -60,4 +60,4 @@ namespace NeOS /// @return none. Void fs_index_file(const Char* filename, SizeT filenameLen, IndexableProperty& indexer); } // namespace Indexer -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/FSKit/NeFS.h b/dev/kernel/FSKit/NeFS.h index 29a294db..d0e376a7 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(NeOS::Char)) -#define kNeFSLbaType (NeOS::Lba) +#define kNeFSBitWidth (sizeof(Kernel::Char)) +#define kNeFSLbaType (Kernel::Lba) /// @note Start after the partition map header. (Virtual addressing) #define kNeFSRootCatalogStartAddress (1024) @@ -142,40 +142,40 @@ struct PACKED NEFS_CATALOG_STRUCT final { BOOL ForkOrCatalog : 1 {0}; - NeOS::Char Name[kNeFSCatalogNameLen] = {0}; - NeOS::Char Mime[kNeFSMimeNameLen] = {0}; + Kernel::Char Name[kNeFSCatalogNameLen] = {0}; + Kernel::Char Mime[kNeFSMimeNameLen] = {0}; /// Catalog flags. - NeOS::UInt16 Flags; + Kernel::UInt16 Flags; /// Catalog allocation status. - NeOS::UInt16 Status; + Kernel::UInt16 Status; /// Custom catalog flags. - NeOS::UInt16 CatalogFlags; + Kernel::UInt16 CatalogFlags; /// Catalog kind. - NeOS::Int32 Kind; + Kernel::Int32 Kind; /// Size of the data fork. - NeOS::Lba DataForkSize; + Kernel::Lba DataForkSize; /// Size of all resource forks. - NeOS::Lba ResourceForkSize; + Kernel::Lba ResourceForkSize; /// Forks LBA. - NeOS::Lba DataFork; - NeOS::Lba ResourceFork; + Kernel::Lba DataFork; + Kernel::Lba ResourceFork; /// Buddy allocation tracker. - NeOS::Lba NextSibling; - NeOS::Lba PrevSibling; + Kernel::Lba NextSibling; + Kernel::Lba PrevSibling; /// Best-buddy tracker. - NeOS::Lba NextBestSibling; - NeOS::Lba NextPrevSibling; + Kernel::Lba NextBestSibling; + Kernel::Lba NextPrevSibling; - NeOS::UInt32 Checksum; + Kernel::UInt32 Checksum; }; /// @brief Fork type, contains a data page. @@ -186,53 +186,53 @@ struct PACKED NEFS_FORK_STRUCT final { BOOL ForkOrCatalog : 1 {1}; - NeOS::Char ForkName[kNeFSForkNameLen] = {0}; - NeOS::Char CatalogName[kNeFSCatalogNameLen] = {0}; + Kernel::Char ForkName[kNeFSForkNameLen] = {0}; + Kernel::Char CatalogName[kNeFSCatalogNameLen] = {0}; - NeOS::Int32 Flags; - NeOS::Int32 Kind; + Kernel::Int32 Flags; + Kernel::Int32 Kind; - NeOS::Int64 ResourceId; - NeOS::Int32 ResourceKind; - NeOS::Int32 ResourceFlags; + Kernel::Int64 ResourceId; + Kernel::Int32 ResourceKind; + Kernel::Int32 ResourceFlags; - NeOS::Lba DataOffset; // 8 Where to look for this data? - NeOS::SizeT DataSize; /// Data size according using sector count. + Kernel::Lba DataOffset; // 8 Where to look for this data? + Kernel::SizeT DataSize; /// Data size according using sector count. - NeOS::Lba NextSibling; - NeOS::Lba PreviousSibling; + Kernel::Lba NextSibling; + Kernel::Lba PreviousSibling; - NeOS::Char Pad[2] = {0}; + Kernel::Char Pad[2] = {0}; }; /// @brief Partition block type struct PACKED NEFS_ROOT_PARTITION_BLOCK final { - NeOS::Char Ident[kNeFSIdentLen] = {0}; - NeOS::Char PartitionName[kNeFSPartLen] = {0}; + Kernel::Char Ident[kNeFSIdentLen] = {0}; + Kernel::Char PartitionName[kNeFSPartLen] = {0}; - NeOS::Int32 Flags; - NeOS::Int32 Kind; + Kernel::Int32 Flags; + Kernel::Int32 Kind; - NeOS::Lba StartCatalog; - NeOS::SizeT CatalogCount; + Kernel::Lba StartCatalog; + Kernel::SizeT CatalogCount; - NeOS::SizeT DiskSize; + Kernel::SizeT DiskSize; - NeOS::SizeT FreeCatalog; - NeOS::SizeT FreeSectors; + Kernel::SizeT FreeCatalog; + Kernel::SizeT FreeSectors; - NeOS::SizeT SectorCount; - NeOS::SizeT SectorSize; + Kernel::SizeT SectorCount; + Kernel::SizeT SectorSize; - NeOS::UInt64 Version; + Kernel::UInt64 Version; - NeOS::Lba EpmBlock; + Kernel::Lba EpmBlock; - NeOS::Char Pad[kNeFSPadLen]; + Kernel::Char Pad[kNeFSPadLen]; }; -namespace NeOS +namespace Kernel { class NeFileSystemParser; class NeFileSystemJournal; @@ -442,4 +442,4 @@ namespace NeOS { Boolean fs_init_nefs(Void) noexcept; } // namespace NeFS -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h b/dev/kernel/FirmwareKit/CoreBoot/CoreBoot.h index 5fe3f4ea..68e401a2 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 NeOS; + using namespace Kernel; struct LEHeader; diff --git a/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/kernel/FirmwareKit/CoreBoot/NetBoot.h index 21ce02ba..040fbbc8 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 NETBOOT_INTERNET_HEADER { - 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 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 PatchName[256U]; /// example: ColdChoco - NeOS::Int32 PatchLength; /// the patch length. - NeOS::Char PatchTarget[256U]; /// 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** + Kernel::Char PatchName[256U]; /// example: ColdChoco + Kernel::Int32 PatchLength; /// the patch length. + Kernel::Char PatchTarget[256U]; /// 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** } NETBOOT_INTERNET_HEADER; diff --git a/dev/kernel/FirmwareKit/EFI/EFI.h b/dev/kernel/FirmwareKit/EFI/EFI.h index ff97f7d6..fdcd8251 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 NeOS; +using namespace Kernel; /* 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 18da8aaa..4d9decac 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 NeOS; + using namespace Kernel; EXTERN_C { diff --git a/dev/kernel/FirmwareKit/EPM.h b/dev/kernel/FirmwareKit/EPM.h index b50a0943..31e9cff0 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 { - NeOS::UInt32 Data1; - NeOS::UInt16 Data2; - NeOS::UInt16 Data3; - NeOS::UInt8 Data4[8]; + Kernel::UInt32 Data1; + Kernel::UInt16 Data2; + Kernel::UInt16 Data3; + Kernel::UInt8 Data4[8]; } PACKED EPM_GUID; /** @@ -80,19 +80,19 @@ typedef struct EPM_GUID */ struct PACKED EPM_PART_BLOCK { - NeOS::Char Magic[kEPMMagicLength]; - NeOS::Char Name[kEPMNameLength]; + Kernel::Char Magic[kEPMMagicLength]; + Kernel::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, HeFS... */ - NeOS::Char Reserved[kEPMReserveLen]; // to fill a full sector. + 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, HeFS... */ + Kernel::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 91838bc7..d129eab7 100644 --- a/dev/kernel/FirmwareKit/GPT.h +++ b/dev/kernel/FirmwareKit/GPT.h @@ -11,7 +11,7 @@ #define kSectorSizeGPT (512U) -namespace NeOS +namespace Kernel { struct GPT_GUID; struct GPT_PARTITION_TABLE; @@ -20,10 +20,10 @@ namespace NeOS /// @brief GPT GUID structure. typedef struct GPT_GUID { - NeOS::UInt32 Data1; - NeOS::UInt16 Data2; - NeOS::UInt16 Data3; - NeOS::UInt8 Data4[8]; + Kernel::UInt32 Data1; + Kernel::UInt16 Data2; + Kernel::UInt16 Data3; + Kernel::UInt8 Data4[8]; } GPT_GUID; struct PACKED GPT_PARTITION_TABLE final @@ -54,4 +54,4 @@ namespace NeOS UInt64 Attributes; UInt8 Name[72]; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/FirmwareKit/Handover.h b/dev/kernel/FirmwareKit/Handover.h index 095e59be..caefb27a 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 NeOS::HEL +namespace Kernel::HEL { /** @brief The executable type enum. @@ -102,7 +102,7 @@ namespace NeOS::HEL /// @brief Alias of bootloader main type. typedef Int32 (*HandoverProc)(BootInfoHeader* boot_info); -} // namespace NeOS::HEL +} // namespace Kernel::HEL /// @brief Bootloader information header global variable. -inline NeOS::HEL::BootInfoHeader* kHandoverHeader = nullptr; +inline Kernel::HEL::BootInfoHeader* kHandoverHeader = nullptr; diff --git a/dev/kernel/HALKit/AMD64/CPUID.h b/dev/kernel/HALKit/AMD64/CPUID.h index 6ea84106..c9a887bc 100644 --- a/dev/kernel/HALKit/AMD64/CPUID.h +++ b/dev/kernel/HALKit/AMD64/CPUID.h @@ -15,7 +15,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { enum @@ -84,4 +84,4 @@ namespace NeOS }; typedef Int64 CPUID; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/kernel/HALKit/AMD64/HalACPIFactoryInterface.cc index f327dc3f..0b933a6a 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 NeOS +namespace Kernel { namespace Detail { @@ -119,4 +119,4 @@ namespace NeOS "jmp reset_wait ; " ".att_syntax; "); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalAPICController.cc b/dev/kernel/HALKit/AMD64/HalAPICController.cc index a4de5091..1d1fd46b 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 NeOS::HAL +namespace Kernel::HAL { APICController::APICController(VoidPtr base) : fApic(base) @@ -41,4 +41,4 @@ namespace NeOS::HAL io_apic[cIOAPICRegReg] = (reg & 0xFF); io_apic[cIOAPICRegVal] = value; } -} // namespace NeOS::HAL +} // namespace Kernel::HAL diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc index 5880cc7c..3d0cee00 100644 --- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -34,7 +34,7 @@ /////////////////////////////////////////////////////////////////////////////////////// -namespace NeOS::HAL +namespace Kernel::HAL { struct PROCESS_APIC_MADT; struct PROCESS_CONTROL_BLOCK; @@ -118,10 +118,10 @@ namespace NeOS::HAL Void hal_send_start_ipi(UInt32 target, UInt32 apic_id) { - NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); - NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); + Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); + Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); - while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { ; } @@ -136,10 +136,10 @@ namespace NeOS::HAL /***********************************************************************************/ Void hal_send_sipi(UInt32 target, UInt32 apic_id, UInt8 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); + 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); - while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { NE_UNUSED(0); } @@ -239,7 +239,7 @@ namespace NeOS::HAL hal_send_start_ipi(kApicBaseAddress, kAPICLocales[kSMPCount]); - HardwareTimer timer(NeOS::rtl_ms(10)); + HardwareTimer timer(Kernel::rtl_ms(10)); timer.Wait(); /// TODO: HAL helper to create an address. @@ -266,6 +266,6 @@ namespace NeOS::HAL /// TODO: Notify Boot AP that it must start. } } -} // namespace NeOS::HAL +} // namespace Kernel::HAL /////////////////////////////////////////////////////////////////////////////////////// diff --git a/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc index cc8a06ea..b1fa95a4 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(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -30,18 +30,18 @@ EXTERN_C void idt_handle_gpf(NeOS::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = NeOS::ProcessStatusKind::kKilled; + process.Leak().Status = Kernel::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle page fault. /// @param rsp -EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -53,20 +53,20 @@ EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp) process.Leak().ProcessSignal.SignalID = SIGKILL; process.Leak().ProcessSignal.PreviousStatus = process.Leak().Status; - process.Leak().Status = NeOS::ProcessStatusKind::kKilled; + process.Leak().Status = Kernel::ProcessStatusKind::kKilled; process.Leak().Crash(); } -namespace NeOS::Detail +namespace Kernel::Detail { constexpr static Int32 kTimeoutCount = 100000UL; } /// @brief Handle scheduler interrupt. -EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) { - static NeOS::Int64 try_count_before_brute = NeOS::Detail::kTimeoutCount; + static Kernel::Int64 try_count_before_brute = Kernel::Detail::kTimeoutCount; while (kIsScheduling) { @@ -76,21 +76,21 @@ EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp) break; } - try_count_before_brute = NeOS::Detail::kTimeoutCount; + try_count_before_brute = Kernel::Detail::kTimeoutCount; kIsScheduling = YES; - NeOS::UserProcessHelper::StartScheduling(); + Kernel::UserProcessHelper::StartScheduling(); kIsScheduling = NO; } /// @brief Handle math fault. /// @param rsp -EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -103,18 +103,18 @@ EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = NeOS::ProcessStatusKind::kKilled; + process.Leak().Status = Kernel::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle any generic fault. /// @param rsp -EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) { kout << "Getting here.\r"; return; @@ -130,16 +130,16 @@ EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = NeOS::ProcessStatusKind::kKilled; + process.Leak().Status = Kernel::ProcessStatusKind::kKilled; process.Leak().Crash(); } -EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip) +EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) { kout << "Kernel: SIGTRAP\r"; @@ -149,7 +149,7 @@ EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip) kIsScheduling = NO; - kout << "Kernel: Process RIP: " << NeOS::hex_number(rip) << kendl; + kout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << kendl; kout << "Kernel: SIGTRAP\r"; process.Leak().ProcessSignal.SignalArg = rip; @@ -159,16 +159,16 @@ EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip) kout << "Kernel: SIGTRAP status.\r"; - process.Leak().Status = NeOS::ProcessStatusKind::kFrozen; + process.Leak().Status = Kernel::ProcessStatusKind::kFrozen; } /// @brief Handle #UD fault. /// @param rsp -EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp) +EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) { - auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); + auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) + if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -181,7 +181,7 @@ EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = NeOS::ProcessStatusKind::kKilled; + process.Leak().Status = Kernel::ProcessStatusKind::kKilled; process.Leak().Crash(); } @@ -189,7 +189,7 @@ EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp) /// @brief Enter syscall from assembly. /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS::UIntPtr rdx_syscall_struct) +EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, Kernel::UIntPtr rdx_syscall_struct) { if (rcx_syscall_index < kSyscalls.Count()) { @@ -199,7 +199,7 @@ EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS: { if (kSyscalls[rcx_syscall_index].fProc) { - (kSyscalls[rcx_syscall_index].fProc)((NeOS::VoidPtr)rdx_syscall_struct); + (kSyscalls[rcx_syscall_index].fProc)((Kernel::VoidPtr)rdx_syscall_struct); } else { @@ -218,7 +218,7 @@ EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS: /// @brief Enter Kernel call from assembly (DDK only). /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS::UIntPtr rdx_kerncall_struct) +EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, Kernel::UIntPtr rdx_kerncall_struct) { if (rcx_kerncall_index < kKerncalls.Count()) { @@ -228,7 +228,7 @@ EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS { if (kKerncalls[rcx_kerncall_index].fProc) { - (kKerncalls[rcx_kerncall_index].fProc)((NeOS::VoidPtr)rdx_kerncall_struct); + (kKerncalls[rcx_kerncall_index].fProc)((Kernel::VoidPtr)rdx_kerncall_struct); } else { diff --git a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc index 2bc89a5e..1aab95aa 100644 --- a/dev/kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/kernel/HALKit/AMD64/HalDebugOutput.cc @@ -11,7 +11,7 @@ #include <modules/CoreGfx/FBMgr.h> #include <modules/CoreGfx/TextMgr.h> -namespace NeOS +namespace Kernel { enum CommStatus : UInt16 { @@ -183,8 +183,8 @@ namespace NeOS TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); + TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); return out; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalDebugPort.cc b/dev/kernel/HALKit/AMD64/HalDebugPort.cc index 7eada646..4cdd8e37 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 NeOS +namespace Kernel { void rt_debug_listen(DebuggerPortHeader* theHook) noexcept { @@ -39,4 +39,4 @@ namespace NeOS HAL::rt_wait_400ns(); } } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc index 154b11af..a83ed2e5 100644 --- a/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc +++ b/dev/kernel/HALKit/AMD64/HalDescriptorLoader.cc @@ -9,11 +9,11 @@ #define kPITDefaultTicks (1000U) -namespace NeOS::HAL +namespace Kernel::HAL { namespace Detail { - STATIC ::NeOS::Detail::AMD64::InterruptDescriptorAMD64 + STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64 kInterruptVectorTable[kKernelIdtSize] = {}; STATIC void hal_set_irq_mask(UInt8 irql); @@ -88,7 +88,7 @@ namespace NeOS::HAL const Int16 kPITTickForScheduler = kPITDefaultTicks; - volatile ::NeOS::UIntPtr** ptr_ivt = (volatile ::NeOS::UIntPtr**)idt.Base; + volatile ::Kernel::UIntPtr** ptr_ivt = (volatile ::Kernel::UIntPtr**)idt.Base; for (SizeT idt_indx = 0; idt_indx < kKernelIdtSize; ++idt_indx) { @@ -104,7 +104,7 @@ namespace NeOS::HAL } idt.Base = (UIntPtr)&Detail::kInterruptVectorTable[0]; - idt.Limit = sizeof(::NeOS::Detail::AMD64::InterruptDescriptorAMD64) * + idt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) * (kKernelIdtSize); hal_load_idt(idt); @@ -123,4 +123,4 @@ namespace NeOS::HAL { IDTLoader::Load(idt.Leak()); } -} // namespace NeOS::HAL +} // namespace Kernel::HAL diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 543e267b..fadb37e4 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -14,33 +14,33 @@ #include <CFKit/Property.h> #include <modules/CoreGfx/TextMgr.h> -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::VoidPtr kInterruptVectorTable[]; +EXTERN_C Kernel::VoidPtr mp_user_switch_proc; +EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; -STATIC NeOS::Void hal_init_scheduler_team() +STATIC Kernel::Void hal_init_scheduler_team() { - for (NeOS::SizeT i = 0U; i < NeOS::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) + for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) { - NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = NeOS::UserProcess(); - NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = NeOS::ProcessStatusKind::kKilled; + Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); + Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled; } } -STATIC NeOS::UInt64 hal_rdtsc_fn() +STATIC Kernel::UInt64 hal_rdtsc_fn() { - NeOS::UInt32 lo, hi; + Kernel::UInt32 lo, hi; __asm__ volatile("rdtsc" : "=a"(lo), "=d"(hi)); - return ((NeOS::UInt64)hi << 32) | lo; + return ((Kernel::UInt64)hi << 32) | lo; } -STATIC NeOS::UInt64 kStartTim, kEndTim; +STATIC Kernel::UInt64 kStartTim, kEndTim; /// @brief Kernel init procedure. EXTERN_C void hal_init_platform( - NeOS::HEL::BootInfoHeader* handover_hdr) + Kernel::HEL::BootInfoHeader* handover_hdr) { kStartTim = hal_rdtsc_fn(); @@ -59,8 +59,8 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( - reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( + reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); /************************************** */ /* INITIALIZE GDT AND SEGMENTS. */ @@ -69,7 +69,7 @@ EXTERN_C void hal_init_platform( STATIC CONST auto kGDTEntriesCount = 6; /* GDT, mostly descriptors for user and kernel segments. */ - STATIC NeOS::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { + STATIC Kernel::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 @@ -78,35 +78,35 @@ EXTERN_C void hal_init_platform( }; // Load memory descriptors. - NeOS::HAL::RegisterGDT gdt_reg; + Kernel::HAL::RegisterGDT gdt_reg; - gdt_reg.Base = reinterpret_cast<NeOS::UIntPtr>(kGDTArray); - gdt_reg.Limit = (sizeof(NeOS::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; + gdt_reg.Base = reinterpret_cast<Kernel::UIntPtr>(kGDTArray); + gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; FB::fb_clear_video(); //! GDT will load hal_read_init after it successfully loads the segments. - NeOS::HAL::GDTLoader gdt_loader; + Kernel::HAL::GDTLoader gdt_loader; gdt_loader.Load(gdt_reg); - NeOS::ke_panic(RUNTIME_CHECK_BOOTSTRAP); + Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP); } -EXTERN_C NeOS::Void hal_real_init(NeOS::Void) noexcept +EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept { - NeOS::NeFS::fs_init_nefs(); + Kernel::NeFS::fs_init_nefs(); - NeOS::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); + Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - NeOS::HAL::Register64 idt_reg; + Kernel::HAL::Register64 idt_reg; - idt_reg.Base = (NeOS::UIntPtr)kInterruptVectorTable; + idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable; - NeOS::HAL::IDTLoader idt_loader; + Kernel::HAL::IDTLoader idt_loader; kEndTim = hal_rdtsc_fn(); - kout << "Cycles Spent Before Userland: " << NeOS::number(kEndTim - kStartTim) << kendl; + kout << "Cycles Spent Before Userland: " << Kernel::number(kEndTim - kStartTim) << kendl; idt_loader.Load(idt_reg); diff --git a/dev/kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/kernel/HALKit/AMD64/HalKernelPanic.cc index f0595903..adf510e1 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 NeOS +namespace Kernel { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace NeOS /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const NeOS::Int32& id, const Char* message) + Void ke_panic(const Kernel::Int32& id, const Char* message) { fb_init(); @@ -65,4 +65,4 @@ namespace NeOS ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/kernel/HALKit/AMD64/HalPagingMgrAMD64.cc index fe9f0421..884d7c9e 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 NeOS::HAL +namespace Kernel::HAL { typedef UInt32 PageTableIndex; @@ -201,4 +201,4 @@ namespace NeOS::HAL return 0; } -} // namespace NeOS::HAL +} // namespace Kernel::HAL diff --git a/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc index b3da8352..b3cf8d09 100644 --- a/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc +++ b/dev/kernel/HALKit/AMD64/HalProcessorAMD64.cc @@ -15,7 +15,7 @@ * @brief Common CPU API. */ -namespace NeOS::HAL +namespace Kernel::HAL { Void lrt_out8(UInt16 port, UInt8 value) { @@ -98,4 +98,4 @@ namespace NeOS::HAL { asm volatile("std"); } -} // namespace NeOS::HAL +} // namespace Kernel::HAL diff --git a/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc b/dev/kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc index bf4b9d91..6b287060 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 NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Unimplemented function (crashes by default) @@ -37,7 +37,7 @@ namespace NeOS /// Wakes up thread from the hang state. Void mp_wakeup_thread(HAL::StackFrame* stack) { - NeOS::UserProcessHelper::StartScheduling(); + Kernel::UserProcessHelper::StartScheduling(); } /// @brief makes the thread sleep on a loop. @@ -49,4 +49,4 @@ namespace NeOS /* Nothing to do, code is spinning */ } } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/kernel/HALKit/AMD64/HalTimerAMD64.cc index 53386d36..55e92dfe 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 NeOS::Detail
+namespace Kernel::Detail
{
- struct HPET_BLOCK : public NeOS::SDT
+ struct HPET_BLOCK : public Kernel::SDT
{
- 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;
+ 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;
- NeOS::UInt8 hpet_number;
- NeOS::UInt16 minimum_tick;
- NeOS::UInt8 page_protection;
+ Kernel::UInt8 hpet_number;
+ Kernel::UInt16 minimum_tick;
+ Kernel::UInt8 page_protection;
} PACKED;
-} // namespace NeOS::Detail
+} // namespace Kernel::Detail
-using namespace NeOS;
+using namespace Kernel;
HardwareTimer::HardwareTimer(Int64 ms)
: fWaitFor(ms)
diff --git a/dev/kernel/HALKit/AMD64/Hypervisor.h b/dev/kernel/HALKit/AMD64/Hypervisor.h index 4c226eee..05539c06 100644 --- a/dev/kernel/HALKit/AMD64/Hypervisor.h +++ b/dev/kernel/HALKit/AMD64/Hypervisor.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { MAKE_STRING_ENUM(HYPERVISOR) ENUM_STRING(Qemu, "TCGTCGTCGTCG"); @@ -22,4 +22,4 @@ namespace NeOS ENUM_STRING(Bhyve, "bhyve bhyve "); ENUM_STRING(Qnx, " QNXQVMBSQG "); END_STRING_ENUM() -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/PCI/DMA.cc b/dev/kernel/HALKit/AMD64/PCI/DMA.cc index c756a572..290030cf 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 NeOS +namespace Kernel { DMAWrapper::operator bool() { @@ -84,4 +84,4 @@ namespace NeOS this->fAddress = Ptr; return *this; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/PCI/Database.cc b/dev/kernel/HALKit/AMD64/PCI/Database.cc index c5aa1282..17bbfe57 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 NeOS +namespace Kernel { } diff --git a/dev/kernel/HALKit/AMD64/PCI/Device.cc b/dev/kernel/HALKit/AMD64/PCI/Device.cc index 348e058a..553ffad4 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Device.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Device.cc @@ -12,33 +12,33 @@ #define PCI_BAR_64 0x04 #define PCI_BAR_PREFETCH 0x08 -NeOS::UInt NE_PCIReadRaw(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) +Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | - ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - NeOS::HAL::rt_wait_400ns(); + Kernel::HAL::rt_wait_400ns(); - return NeOS::HAL::rt_in32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigData); + return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); } -void NE_PCISetCfgTarget(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) +void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | - ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - NeOS::HAL::rt_wait_400ns(); + Kernel::HAL::rt_wait_400ns(); } -namespace NeOS::PCI +namespace Kernel::PCI { Device::Device(UShort bus, UShort device, UShort func, UInt32 bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -168,4 +168,4 @@ namespace NeOS::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace NeOS::PCI +} // namespace Kernel::PCI diff --git a/dev/kernel/HALKit/AMD64/PCI/Express.cc b/dev/kernel/HALKit/AMD64/PCI/Express.cc index 487cbd39..341d2e69 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 NeOS +namespace Kernel { } diff --git a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc index bf215fe2..d8020ebc 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 NeOS::PCI +namespace Kernel::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -36,4 +36,4 @@ namespace NeOS::PCI { return fDevices[at]; } -} // namespace NeOS::PCI +} // namespace Kernel::PCI diff --git a/dev/kernel/HALKit/AMD64/Paging.h b/dev/kernel/HALKit/AMD64/Paging.h index 09b6ade3..4084e86a 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(NeOS::VoidPtr addr); -EXTERN_C void hal_write_cr3(NeOS::VoidPtr cr3); -EXTERN_C void hal_write_cr0(NeOS::VoidPtr bit); +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 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. +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. -namespace NeOS::HAL +namespace Kernel::HAL { /// @brief Final page entry (Not PML, PDPT) struct PACKED NE_PTE final @@ -90,10 +90,10 @@ namespace NeOS::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page, const SizeT pad = 0) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace NeOS::HAL +} // namespace Kernel::HAL -namespace NeOS +namespace Kernel { typedef HAL::NE_PTE PTE; typedef HAL::NE_PDE PDE; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/Processor.h b/dev/kernel/HALKit/AMD64/Processor.h index d223c320..83fde9ba 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 NeOS +namespace Kernel { namespace Detail::AMD64 { @@ -64,9 +64,9 @@ namespace NeOS UInt32 Zero; // reserved }; } // namespace Detail::AMD64 -} // namespace NeOS +} // namespace Kernel -namespace NeOS::HAL +namespace Kernel::HAL { /// @brief Memory Manager mapping flags. enum @@ -312,15 +312,15 @@ namespace NeOS::HAL EXTERN_C Void rt_sti(); EXTERN_C Void rt_cld(); EXTERN_C Void rt_std(); -} // namespace NeOS::HAL +} // namespace Kernel::HAL -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 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 ATTRIBUTE(naked) NeOS::Void hal_load_idt(NeOS::HAL::Register64 ptr); -EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_gdt(NeOS::HAL::RegisterGDT ptr); +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); -inline NeOS::VoidPtr kKernelBitMpStart = nullptr; -inline NeOS::UIntPtr kKernelBitMpSize = 0UL; +inline Kernel::VoidPtr kKernelBitMpStart = nullptr; +inline Kernel::UIntPtr kKernelBitMpSize = 0UL; diff --git a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc index c941d2ba..318327f8 100644 --- a/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/AHCI+Generic.cc @@ -53,7 +53,7 @@ #define kSATASubClass (0x06) #define kSATABar5 (0x24) -using namespace NeOS; +using namespace Kernel; STATIC PCI::Device kSATADev; STATIC HbaMemRef kSATAHba; @@ -386,7 +386,7 @@ Bool drv_std_detected_ahci() return kSATADev.DeviceId() != (UShort)PCI::PciConfigKind::Invalid && kSATADev.Bar(kSATABar5) != 0; } -namespace NeOS +namespace Kernel { /// @brief Initialize an AHCI device (StorageKit) UInt16 sk_init_ahci_device(BOOL atapi) @@ -464,7 +464,7 @@ namespace NeOS return ErrorOr<AHCIDeviceInterface>(device); } -} // namespace NeOS +} // namespace Kernel // ================================================================================================ diff --git a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc index 9624ea5b..261643fc 100644 --- a/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/DMA+Generic.cc @@ -23,15 +23,15 @@ #define kATADataLen (256) -using namespace NeOS; -using namespace NeOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// BUGS: 0 STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; -STATIC NeOS::PCI::Device kATADevice; +STATIC Kernel::PCI::Device kATADevice; STATIC Char kCurrentDiskModel[50] = {"UNKNOWN DMA 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] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); + kATAData[i] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); drv_std_wait_io(IO); } @@ -131,7 +131,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) return NO; } -namespace NeOS::Detail +namespace Kernel::Detail { struct PRDEntry { @@ -139,7 +139,7 @@ namespace NeOS::Detail UInt16 mByteCount; UInt16 mFlags; }; -} // namespace NeOS::Detail +} // namespace Kernel::Detail static UIntPtr kReadAddr = mib_cast(2); static UIntPtr kWriteAddr = mib_cast(4); @@ -166,7 +166,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); - NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct. + Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); // The PRDEntry is not correct. prd->mAddress = (UInt32)(UIntPtr)kReadAddr; prd->mByteCount = Size - 1; @@ -209,7 +209,7 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); - NeOS::Detail::PRDEntry* prd = (NeOS::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); + Kernel::Detail::PRDEntry* prd = (Kernel::Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4); prd->mAddress = (UInt32)(UIntPtr)kWriteAddr; prd->mByteCount = Size - 1; @@ -243,7 +243,7 @@ Boolean drv_std_detected(Void) @return Number of sectors, or zero. */ /***********************************************************************************/ -NeOS::SizeT drv_get_sector_count() +Kernel::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } @@ -251,7 +251,7 @@ NeOS::SizeT drv_get_sector_count() /***********************************************************************************/ /// @brief Get the size of the current drive. /***********************************************************************************/ -NeOS::SizeT drv_get_size() +Kernel::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc index e2891484..2bbdb0e5 100644 --- a/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc +++ b/dev/kernel/HALKit/AMD64/Storage/PIO+Generic.cc @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace NeOS; -using namespace NeOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// BUGS: 0 diff --git a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc index 5fb45452..384fc7b1 100644 --- a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc +++ b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc @@ -7,7 +7,7 @@ #include <modules/APM/APM.h> #include <KernelKit/KPC.h> -using namespace NeOS; +using namespace Kernel; /// @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 d263f9b8..e987cf81 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 NeOS +namespace Kernel { - BOOL mp_initialize_gic(NeOS::Void); + BOOL mp_initialize_gic(Kernel::Void); }
\ No newline at end of file diff --git a/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc index a25112ae..9ba83c3d 100644 --- a/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc +++ b/dev/kernel/HALKit/ARM64/HalACPIFactoryInterface.cc @@ -10,7 +10,7 @@ #include <KernelKit/MemoryMgr.h> #include <modules/APM/APM.h> -namespace NeOS +namespace Kernel { ACPIFactoryInterface::ACPIFactoryInterface(VoidPtr rsp_ptr) : fRsdp(rsp_ptr), fEntries(0) @@ -29,4 +29,4 @@ namespace NeOS { apm_send_io_command(kAPMPowerCommandReboot, 0); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc index 660af502..60f5bda3 100644 --- a/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc +++ b/dev/kernel/HALKit/ARM64/HalApplicationProcessor.cc @@ -28,7 +28,7 @@ // ================================================================= //
-namespace NeOS
+namespace Kernel
{
struct PROCESS_CONTROL_BLOCK final
{
@@ -142,4 +142,4 @@ namespace NeOS return Detail::kGICEnabled;
}
-} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/HALKit/ARM64/HalDebugOutput.cc b/dev/kernel/HALKit/ARM64/HalDebugOutput.cc index 8d54739f..5c668605 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 NeOS +namespace Kernel { EXTERN_C void ke_io_write(IDeviceObject<const Char*>* self, const Char* bytes) { @@ -76,8 +76,8 @@ namespace NeOS TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); + TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); return out; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/ARM64/HalKernelMain.cc b/dev/kernel/HALKit/ARM64/HalKernelMain.cc index 55caca94..e5ee3d42 100644 --- a/dev/kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/kernel/HALKit/ARM64/HalKernelMain.cc @@ -21,7 +21,7 @@ #include <HALKit/ARM64/ApplicationProcessor.h> EXTERN_C void hal_init_platform( - NeOS::HEL::BootInfoHeader* handover_hdr) + Kernel::HEL::BootInfoHeader* handover_hdr) { /************************************************** */ @@ -41,12 +41,12 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( - reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( + reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); /// @note do initialize the interrupts after it. - NeOS::mp_initialize_gic(); + Kernel::mp_initialize_gic(); while (YES) { diff --git a/dev/kernel/HALKit/ARM64/HalKernelPanic.cc b/dev/kernel/HALKit/ARM64/HalKernelPanic.cc index 5037f440..4001b05f 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 NeOS +namespace Kernel { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace NeOS /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const NeOS::Int32& id, const Char* message) + Void ke_panic(const Kernel::Int32& id, const Char* message) { fb_init(); @@ -77,4 +77,4 @@ namespace NeOS ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/kernel/HALKit/ARM64/HalPagingMgrARM64.cc index 4ec45b51..8fa8422a 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 NeOS::HAL +namespace Kernel::HAL { typedef UInt32 PageTableIndex; @@ -83,4 +83,4 @@ namespace NeOS::HAL return 0; } -} // namespace NeOS::HAL +} // namespace Kernel::HAL diff --git a/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc index 55c8aab5..629e4eca 100644 --- a/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc +++ b/dev/kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc @@ -6,7 +6,7 @@ #include <KernelKit/UserProcessScheduler.h> -namespace NeOS +namespace Kernel { /// @brief Wakes up thread. /// Wakes up thread from the hang state. @@ -21,4 +21,4 @@ namespace NeOS { NE_UNUSED(stack); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc b/dev/kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc index 3a9b7074..00a11fac 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 NeOS
+namespace Kernel
{
/***********************************************************************************/
/// @brief Unimplemented function (crashes by default)
@@ -32,4 +32,4 @@ namespace NeOS return stack_ptr->SP != 0 && stack_ptr->BP != 0;
}
-} // namespace NeOS
+} // namespace Kernel
diff --git a/dev/kernel/HALKit/ARM64/Paging.h b/dev/kernel/HALKit/ARM64/Paging.h index 3c24f757..c27b982b 100644 --- a/dev/kernel/HALKit/ARM64/Paging.h +++ b/dev/kernel/HALKit/ARM64/Paging.h @@ -56,7 +56,7 @@ M, N \ } -namespace NeOS::HAL +namespace Kernel::HAL { struct PACKED PTE_4KB final { @@ -109,12 +109,12 @@ namespace NeOS::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace NeOS::HAL +} // namespace Kernel::HAL -namespace NeOS +namespace Kernel { typedef HAL::PTE_4KB PTE; typedef HAL::PDE_4KB PDE; -} // namespace NeOS +} // namespace Kernel EXTERN_C void hal_flush_tlb(); diff --git a/dev/kernel/HALKit/ARM64/Processor.h b/dev/kernel/HALKit/ARM64/Processor.h index 940cfbe9..cf600122 100644 --- a/dev/kernel/HALKit/ARM64/Processor.h +++ b/dev/kernel/HALKit/ARM64/Processor.h @@ -13,7 +13,7 @@ #define kCPUBackendName "ARMv8" -namespace NeOS::HAL +namespace Kernel::HAL { struct PACKED Register64 final { @@ -81,11 +81,11 @@ namespace NeOS::HAL { asm volatile("wfi"); } -} // namespace NeOS::HAL +} // namespace Kernel::HAL -inline NeOS::VoidPtr kKernelBitMpStart = nullptr; -inline NeOS::UIntPtr kKernelBitMpSize = 0UL; +inline Kernel::VoidPtr kKernelBitMpStart = nullptr; +inline Kernel::UIntPtr kKernelBitMpSize = 0UL; -inline NeOS::VoidPtr kKernelPhysicalStart = nullptr; +inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; #include <HALKit/ARM64/Paging.h> diff --git a/dev/kernel/HALKit/POWER/AP.h b/dev/kernel/HALKit/POWER/AP.h index e0ef3ffb..b97b6d3e 100644 --- a/dev/kernel/HALKit/POWER/AP.h +++ b/dev/kernel/HALKit/POWER/AP.h @@ -15,19 +15,19 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { struct HAL_HARDWARE_THREAD; /// @brief hardware thread indentification type. - typedef NeOS::Int32 hal_ap_kind; + typedef Kernel::Int32 hal_ap_kind; /// @brief Hardware thread information structure. typedef struct HAL_HARDWARE_THREAD { - NeOS::UIntPtr fStartAddress; - NeOS::UInt8 fPrivleged : 1; - NeOS::UInt32 fPageMemoryFlags; + Kernel::UIntPtr fStartAddress; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageMemoryFlags; hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; @@ -35,5 +35,5 @@ namespace NeOS /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); -} // namespace NeOS + EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); +} // namespace Kernel diff --git a/dev/kernel/HALKit/POWER/HalAP.cc b/dev/kernel/HALKit/POWER/HalAP.cc index 32f91a5f..00112702 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 NeOS; +using namespace Kernel; -namespace NeOS::Detail +namespace Kernel::Detail { STATIC void mp_hang_fn(void) { while (YES) ; } -} // namespace NeOS::Detail +} // namespace Kernel::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>(NeOS::Detail::mp_hang_fn)); + hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn)); } diff --git a/dev/kernel/HALKit/POWER/HalDebugOutput.cc b/dev/kernel/HALKit/POWER/HalDebugOutput.cc index e9b2c85a..16ce8c6f 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 NeOS; +using namespace Kernel; /// @brief Writes to COM1. /// @param bytes diff --git a/dev/kernel/HALKit/POWER/HalVirtualMemory.cc b/dev/kernel/HALKit/POWER/HalVirtualMemory.cc index d3d4b694..3d56f2ac 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 NeOS; +using namespace Kernel; EXTERN_C Void hal_write_tlb(UInt32 mas0, UInt32 mas1, UInt32 mas2, UInt32 mas3, UInt32 mas7) { diff --git a/dev/kernel/HALKit/POWER/MBCI/.gitkeep b/dev/kernel/HALKit/POWER/MBCI/.gitkeep deleted file mode 100644 index e69de29b..00000000 --- a/dev/kernel/HALKit/POWER/MBCI/.gitkeep +++ /dev/null diff --git a/dev/kernel/HALKit/POWER/MBCI/HalMBCIHost.cc b/dev/kernel/HALKit/POWER/MBCI/HalMBCIHost.cc deleted file mode 100644 index 0d2e140b..00000000 --- a/dev/kernel/HALKit/POWER/MBCI/HalMBCIHost.cc +++ /dev/null @@ -1,8 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. - -------------------------------------------- */ - -#include <HALKit/POWER/Processor.h> -#include <KernelKit/DebugOutput.h> diff --git a/dev/kernel/HALKit/POWER/Processor.h b/dev/kernel/HALKit/POWER/Processor.h index bbcfd01f..6db4e3cd 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 NeOS::HAL +namespace Kernel::HAL { typedef UIntPtr Reg; @@ -47,16 +47,16 @@ namespace NeOS::HAL { NoOp(); // no oop } -} // namespace NeOS::HAL +} // namespace Kernel::HAL -EXTERN_C NeOS::Void int_handle_math(NeOS::UIntPtr sp); -EXTERN_C NeOS::Void int_handle_pf(NeOS::UIntPtr sp); +EXTERN_C Kernel::Void int_handle_math(Kernel::UIntPtr sp); +EXTERN_C Kernel::Void int_handle_pf(Kernel::UIntPtr sp); /// @brief Set TLB. -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); +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); /// @brief Write TLB. -NeOS::Void hal_write_tlb(NeOS::UInt32 mas0, NeOS::UInt32 mas1, NeOS::UInt32 mas2, NeOS::UInt32 mas3, NeOS::UInt32 mas7); +Kernel::Void hal_write_tlb(Kernel::UInt32 mas0, Kernel::UInt32 mas1, Kernel::UInt32 mas2, Kernel::UInt32 mas3, Kernel::UInt32 mas7); /// @brief Flush TLB. -EXTERN_C NeOS::Void hal_flush_tlb(); +EXTERN_C Kernel::Void hal_flush_tlb(); diff --git a/dev/kernel/HALKit/RISCV/AP.h b/dev/kernel/HALKit/RISCV/AP.h index c198a404..33ca3192 100644 --- a/dev/kernel/HALKit/RISCV/AP.h +++ b/dev/kernel/HALKit/RISCV/AP.h @@ -15,15 +15,15 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { typedef Int64 hal_ap_kind; typedef struct HAL_HARDWARE_THREAD { - NeOS::UIntPtr fStartAddress; - NeOS::UInt8 fPrivleged : 1; - NeOS::UInt32 fPageMemoryFlags; + Kernel::UIntPtr fStartAddress; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageMemoryFlags; hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; @@ -31,5 +31,5 @@ namespace NeOS /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); -} // namespace NeOS + EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); +} // namespace Kernel diff --git a/dev/kernel/HALKit/RISCV/HalAP.cc b/dev/kernel/HALKit/RISCV/HalAP.cc index 788acf0f..c271f011 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 NeOS;
+using namespace Kernel;
-namespace NeOS::Detail
+namespace Kernel::Detail
{
STATIC void mp_hang_fn(void)
{
while (YES)
;
}
-} // namespace NeOS::Detail
+} // namespace Kernel::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>(NeOS::Detail::mp_hang_fn));
+ hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn));
}
diff --git a/dev/kernel/KernelKit/BinaryMutex.h b/dev/kernel/KernelKit/BinaryMutex.h index 21b2ca6d..bb571a37 100644 --- a/dev/kernel/KernelKit/BinaryMutex.h +++ b/dev/kernel/KernelKit/BinaryMutex.h @@ -10,7 +10,7 @@ #include <KernelKit/Timer.h> #include <CompilerKit/CompilerKit.h> -namespace NeOS +namespace Kernel { class UserProcess; @@ -40,4 +40,4 @@ namespace NeOS private: UserProcessRef fLockingProcess; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/CodeMgr.h b/dev/kernel/KernelKit/CodeMgr.h index 5f83c74b..15ec420e 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 NeOS +namespace Kernel { /// @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 NeOS /// @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 NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/DebugOutput.h b/dev/kernel/KernelKit/DebugOutput.h index cfadd38d..aa12518f 100644 --- a/dev/kernel/KernelKit/DebugOutput.h +++ b/dev/kernel/KernelKit/DebugOutput.h @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace NeOS +namespace Kernel { class TerminalDevice; class DTraceDevice; @@ -202,12 +202,12 @@ namespace NeOS src = number(num); return src; } -} // namespace NeOS +} // namespace Kernel #ifdef kout #undef kout #endif // ifdef kout -#define kout NeOS::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " +#define kout Kernel::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " -#define kendl NeOS::TerminalDevice::The() << NeOS::end_line() +#define kendl Kernel::TerminalDevice::The() << Kernel::end_line() diff --git a/dev/kernel/KernelKit/Defines.h b/dev/kernel/KernelKit/Defines.h index d86988a7..d2e59535 100644 --- a/dev/kernel/KernelKit/Defines.h +++ b/dev/kernel/KernelKit/Defines.h @@ -12,4 +12,5 @@ #define KERNELKIT_VERSION_BCD 0x01020 class UserProcessScheduler; +class IDylibObject; class UserProcess; diff --git a/dev/kernel/KernelKit/DeviceMgr.h b/dev/kernel/KernelKit/DeviceMgr.h index fa68d2e7..c2689493 100644 --- a/dev/kernel/KernelKit/DeviceMgr.h +++ b/dev/kernel/KernelKit/DeviceMgr.h @@ -24,11 +24,11 @@ #define kDeviceMgrRootDirPath "/Devices/" -#define NE_DEVICE : public ::NeOS::IDeviceObject +#define NE_DEVICE : public ::Kernel::IDeviceObject // Last Rev: Wed, Apr 3, 2024 9:09:41 AM -namespace NeOS +namespace Kernel { template <typename T> class IDeviceObject; @@ -137,4 +137,4 @@ namespace NeOS kDeviceTypeMediaCtrl, // MM controller kDeviceTypeCount, }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h index fd972ab7..9d461703 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 NeOS +namespace Kernel { enum { @@ -186,6 +186,6 @@ namespace NeOS /// @param DrvIndex drive index. /// @return Int32 fs_ifs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex); -} // namespace NeOS +} // namespace Kernel #endif /* ifndef INC_DRIVE_MANAGER_H */ diff --git a/dev/kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h index 61bb6440..68036aad 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<NeOS::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR) /** @note Refer to first enum. @@ -60,7 +60,7 @@ /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -namespace NeOS +namespace Kernel { enum { @@ -387,6 +387,6 @@ namespace NeOS { mm_delete_heap(fFile); } -} // namespace NeOS +} // namespace Kernel #endif // ifndef INC_FILEMGR_H diff --git a/dev/kernel/KernelKit/HardwareThreadScheduler.h b/dev/kernel/KernelKit/HardwareThreadScheduler.h index 1866686e..6ee55226 100644 --- a/dev/kernel/KernelKit/HardwareThreadScheduler.h +++ b/dev/kernel/KernelKit/HardwareThreadScheduler.h @@ -16,7 +16,7 @@ #define kMaxAPInsideSched (8U) -namespace NeOS +namespace Kernel { class HardwareThread; class HardwareThreadScheduler; @@ -144,6 +144,6 @@ namespace NeOS /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void mp_hang_thread(HAL::StackFramePtr stack); -} // namespace NeOS +} // namespace Kernel #endif // !__INC_MP_MANAGER_H__ diff --git a/dev/kernel/KernelKit/IDylibObject.h b/dev/kernel/KernelKit/IDylibObject.h index c872b86f..f02fb9d3 100644 --- a/dev/kernel/KernelKit/IDylibObject.h +++ b/dev/kernel/KernelKit/IDylibObject.h @@ -14,7 +14,7 @@ #define NE_DYLIB_OBJECT : public IDylibObject -namespace NeOS +namespace Kernel { /// @brief DLL class object. A handle to a shared library. class IDylibObject @@ -45,4 +45,4 @@ namespace NeOS /// @brief Pure implementation, missing method/function handler. EXTERN_C void __zka_pure_call(void); -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/IPEFDylibObject.h b/dev/kernel/KernelKit/IPEFDylibObject.h index 20f87410..22360e50 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 NeOS +namespace Kernel { /** * @brief Shared Library class @@ -101,6 +101,6 @@ namespace NeOS EXTERN_C IDylibRef rtl_init_dylib(UserProcess& header); EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); -} // namespace NeOS +} // namespace Kernel #endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */ diff --git a/dev/kernel/KernelKit/KPC.h b/dev/kernel/KernelKit/KPC.h index 9b62c14e..c6724282 100644 --- a/dev/kernel/KernelKit/KPC.h +++ b/dev/kernel/KernelKit/KPC.h @@ -11,15 +11,15 @@ /// @file KPC.h /// @brief Kernel Procedure Code. -#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_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_global_ok() (NeOS::kErrorLocalNumber == NeOS::kErrorSuccess) -#define err_global_fail() (NeOS::kErrorLocalNumber != NeOS::kErrorSuccess) -#define err_global_get() (NeOS::kErrorLocalNumber) +#define err_global_ok() (Kernel::kErrorLocalNumber == Kernel::kErrorSuccess) +#define err_global_fail() (Kernel::kErrorLocalNumber != Kernel::kErrorSuccess) +#define err_global_get() (Kernel::kErrorLocalNumber) -namespace NeOS +namespace Kernel { typedef Int32 HError; @@ -64,4 +64,4 @@ namespace NeOS /// @param void no params are needed. /// @return if error-free: false, otherwise true. Boolean err_bug_check_raise(Void) noexcept; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/LoaderInterface.h index 99291c04..cb833732 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 NeOS +namespace Kernel { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss @@ -31,4 +31,4 @@ namespace NeOS virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const Char* name, _Input Int32 kind) = 0; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/LockDelegate.h b/dev/kernel/KernelKit/LockDelegate.h index 28eff060..5143cf2b 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 NeOS +namespace Kernel { enum { @@ -68,4 +68,4 @@ namespace NeOS private: Atom<UInt> fLockStatus; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/MBCI/.keep b/dev/kernel/KernelKit/MBCI/.keep deleted file mode 100644 index e69de29b..00000000 --- a/dev/kernel/KernelKit/MBCI/.keep +++ /dev/null diff --git a/dev/kernel/KernelKit/MSDOS.h b/dev/kernel/KernelKit/MSDOS.h index 1a3df13b..8d18b884 100644 --- a/dev/kernel/KernelKit/MSDOS.h +++ b/dev/kernel/KernelKit/MSDOS.h @@ -23,12 +23,12 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef NeOS::UInt32 DosWord; -typedef NeOS::Long DosLong; +typedef Kernel::UInt32 DosWord; +typedef Kernel::Long DosLong; typedef struct _DosHeader { - NeOS::UInt8 eMagic[2]; + Kernel::UInt8 eMagic[2]; DosWord eMagLen; DosWord ePagesCount; DosWord eCrlc; diff --git a/dev/kernel/KernelKit/MemoryMgr.h b/dev/kernel/KernelKit/MemoryMgr.h index e2b8aa2f..229b6aa6 100644 --- a/dev/kernel/KernelKit/MemoryMgr.h +++ b/dev/kernel/KernelKit/MemoryMgr.h @@ -9,13 +9,13 @@ /// @date 30/01/24 /// @file: MemoryMgr.h -/// @brief: heap allocation support. +/// @brief: Memory allocation support for the NeKernel. #include <NewKit/KernelPanic.h> #include <KernelKit/KPC.h> #include <hint/CompilerHint.h> -namespace NeOS +namespace Kernel { /// @brief Declare pointer as free. /// @param heap_ptr the pointer. @@ -66,7 +66,7 @@ namespace NeOS { if (*cls) { - err_global_get() = NeOS::kErrorInvalidData; + err_global_get() = Kernel::kErrorInvalidData; return NO; } @@ -82,6 +82,6 @@ namespace NeOS delete *cls; *cls = nullptr; } -} // namespace NeOS +} // namespace Kernel #endif // !INC_KERNEL_HEAP_H diff --git a/dev/kernel/KernelKit/PCI/DMA.h b/dev/kernel/KernelKit/PCI/DMA.h index 68f3fa37..fc49dd4f 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 NeOS +namespace Kernel { enum class DmaKind { @@ -76,6 +76,6 @@ namespace NeOS public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace NeOS +} // namespace Kernel #include <KernelKit/PCI/DMA.inl> diff --git a/dev/kernel/KernelKit/PCI/DMA.inl b/dev/kernel/KernelKit/PCI/DMA.inl index d9c6e551..f3fb0f8c 100644 --- a/dev/kernel/KernelKit/PCI/DMA.inl +++ b/dev/kernel/KernelKit/PCI/DMA.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <class T> T* DMAWrapper::operator->() @@ -17,4 +17,4 @@ namespace NeOS { return reinterpret_cast<T*>((UIntPtr)this->fAddress + offset); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/PCI/Database.h b/dev/kernel/KernelKit/PCI/Database.h index cb12a731..82084bb1 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 NeOS +namespace Kernel { namespace Types { @@ -35,24 +35,24 @@ namespace NeOS Invalid = Unassgined, }; } // namespace Types -} // namespace NeOS +} // namespace Kernel -inline BOOL operator!=(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator!=(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs != (NeOS::UChar)lhs; + return rhs != (Kernel::UChar)lhs; } -inline BOOL operator==(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator==(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs == (NeOS::UChar)lhs; + return rhs == (Kernel::UChar)lhs; } -inline BOOL operator!=(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator!=(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs != (NeOS::UChar)rhs; + return lhs != (Kernel::UChar)rhs; } -inline BOOL operator==(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator==(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs == (NeOS::UChar)rhs; + return lhs == (Kernel::UChar)rhs; }
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Device.h b/dev/kernel/KernelKit/PCI/Device.h index 9870f618..cb463485 100644 --- a/dev/kernel/KernelKit/PCI/Device.h +++ b/dev/kernel/KernelKit/PCI/Device.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace NeOS::PCI +namespace Kernel::PCI { enum class PciConfigKind : UShort { @@ -75,7 +75,7 @@ namespace NeOS::PCI UShort fFunction; UInt32 fBar; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI -EXTERN_C void NewOSPCISetCfgTarget(NeOS::UInt bar); -EXTERN_C NeOS::UInt NewOSPCIReadRaw(NeOS::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); +EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); diff --git a/dev/kernel/KernelKit/PCI/IO.h b/dev/kernel/KernelKit/PCI/IO.h index 1d60df8e..1de30b63 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 NeOS +namespace Kernel { template <SizeT Sz> class IOArray final @@ -66,7 +66,7 @@ namespace NeOS return ports; } -} // namespace NeOS +} // namespace Kernel #ifdef __x86_64__ #include <KernelKit/PCI/IOArray+AMD64.inl> diff --git a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl index 2630fa98..223546c5 100644 --- a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl +++ b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <SizeT Sz> template <typename T> @@ -51,4 +51,4 @@ namespace NeOS break; } } -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Iterator.h b/dev/kernel/KernelKit/PCI/Iterator.h index 2a788450..c364e1f7 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 NeOS::PCI +namespace Kernel::PCI { class Iterator final { @@ -38,6 +38,6 @@ namespace NeOS::PCI private: Array<PCI::Device, NE_BUS_COUNT> fDevices; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI #endif // __PCI_ITERATOR_H__ diff --git a/dev/kernel/KernelKit/PCI/PCI.h b/dev/kernel/KernelKit/PCI/PCI.h index 7eec9ec1..11bc7b94 100644 --- a/dev/kernel/KernelKit/PCI/PCI.h +++ b/dev/kernel/KernelKit/PCI/PCI.h @@ -15,7 +15,7 @@ #define kPCIFuncCount (8) #define kPCIBusCount (256U) -namespace NeOS::PCI +namespace Kernel::PCI { // model struct DeviceHeader @@ -56,4 +56,4 @@ namespace NeOS::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI diff --git a/dev/kernel/KernelKit/PE.h b/dev/kernel/KernelKit/PE.h index dbcf2ded..3746cf90 100644 --- a/dev/kernel/KernelKit/PE.h +++ b/dev/kernel/KernelKit/PE.h @@ -29,62 +29,62 @@ typedef struct LDR_EXEC_HEADER final { - NeOS::UInt32 Signature; - NeOS::UInt16 Machine; - NeOS::UInt16 NumberOfSections; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt32 PointerToSymbolTable; - NeOS::UInt32 NumberOfSymbols; - NeOS::UInt16 SizeOfOptionalHeader; - NeOS::UInt16 Characteristics; + Kernel::UInt32 Signature; + Kernel::UInt16 Machine; + Kernel::UInt16 NumberOfSections; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt32 PointerToSymbolTable; + Kernel::UInt32 NumberOfSymbols; + Kernel::UInt16 SizeOfOptionalHeader; + Kernel::UInt16 Characteristics; } LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR; typedef struct LDR_OPTIONAL_HEADER final { - NeOS::UInt16 Magic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - NeOS::UInt8 MajorLinkerVersion; - NeOS::UInt8 MinorLinkerVersion; - NeOS::UInt32 SizeOfCode; - NeOS::UInt32 SizeOfInitializedData; - NeOS::UInt32 SizeOfUninitializedData; - NeOS::UInt32 AddressOfEntryPoint; - NeOS::UInt32 BaseOfCode; - NeOS::UInt32 BaseOfData; - NeOS::UInt32 ImageBase; - NeOS::UInt32 SectionAlignment; - NeOS::UInt32 FileAlignment; - NeOS::UInt16 MajorOperatingSystemVersion; - NeOS::UInt16 MinorOperatingSystemVersion; - NeOS::UInt16 MajorImageVersion; - NeOS::UInt16 MinorImageVersion; - NeOS::UInt16 MajorSubsystemVersion; - NeOS::UInt16 MinorSubsystemVersion; - NeOS::UInt32 Win32VersionValue; - NeOS::UInt32 SizeOfImage; - NeOS::UInt32 SizeOfHeaders; - NeOS::UInt32 CheckSum; - NeOS::UInt16 Subsystem; - NeOS::UInt16 DllCharacteristics; - NeOS::UInt32 SizeOfStackReserve; - NeOS::UInt32 SizeOfStackCommit; - NeOS::UInt32 SizeOfHeapReserve; - NeOS::UInt32 SizeOfHeapCommit; - NeOS::UInt32 LoaderFlags; - NeOS::UInt32 NumberOfRvaAndSizes; + Kernel::UInt16 Magic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + Kernel::UInt8 MajorLinkerVersion; + Kernel::UInt8 MinorLinkerVersion; + Kernel::UInt32 SizeOfCode; + Kernel::UInt32 SizeOfInitializedData; + Kernel::UInt32 SizeOfUninitializedData; + Kernel::UInt32 AddressOfEntryPoint; + Kernel::UInt32 BaseOfCode; + Kernel::UInt32 BaseOfData; + Kernel::UInt32 ImageBase; + Kernel::UInt32 SectionAlignment; + Kernel::UInt32 FileAlignment; + Kernel::UInt16 MajorOperatingSystemVersion; + Kernel::UInt16 MinorOperatingSystemVersion; + Kernel::UInt16 MajorImageVersion; + Kernel::UInt16 MinorImageVersion; + Kernel::UInt16 MajorSubsystemVersion; + Kernel::UInt16 MinorSubsystemVersion; + Kernel::UInt32 Win32VersionValue; + Kernel::UInt32 SizeOfImage; + Kernel::UInt32 SizeOfHeaders; + Kernel::UInt32 CheckSum; + Kernel::UInt16 Subsystem; + Kernel::UInt16 DllCharacteristics; + Kernel::UInt32 SizeOfStackReserve; + Kernel::UInt32 SizeOfStackCommit; + Kernel::UInt32 SizeOfHeapReserve; + Kernel::UInt32 SizeOfHeapCommit; + Kernel::UInt32 LoaderFlags; + Kernel::UInt32 NumberOfRvaAndSizes; } LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR; typedef struct LDR_SECTION_HEADER final { - NeOS::Char Name[8]; - NeOS::UInt32 VirtualSize; - NeOS::UInt32 VirtualAddress; - NeOS::UInt32 SizeOfRawData; - NeOS::UInt32 PointerToRawData; - NeOS::UInt32 PointerToRelocations; - NeOS::UInt32 PointerToLineNumbers; - NeOS::UInt16 NumberOfRelocations; - NeOS::UInt16 NumberOfLinenumbers; - NeOS::UInt32 Characteristics; + Kernel::Char Name[8]; + Kernel::UInt32 VirtualSize; + Kernel::UInt32 VirtualAddress; + Kernel::UInt32 SizeOfRawData; + Kernel::UInt32 PointerToRawData; + Kernel::UInt32 PointerToRelocations; + Kernel::UInt32 PointerToLineNumbers; + Kernel::UInt16 NumberOfRelocations; + Kernel::UInt16 NumberOfLinenumbers; + Kernel::UInt32 Characteristics; } LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR; enum kExecDataDirParams @@ -97,35 +97,35 @@ enum kExecDataDirParams typedef struct LDR_EXPORT_DIRECTORY { - NeOS::UInt32 Characteristics; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt16 MajorVersion; - NeOS::UInt16 MinorVersion; - NeOS::UInt32 Name; - NeOS::UInt32 Base; - NeOS::UInt32 NumberOfFunctions; - NeOS::UInt32 NumberOfNames; - NeOS::UInt32 AddressOfFunctions; // export table rva - NeOS::UInt32 AddressOfNames; - NeOS::UInt32 AddressOfNameOrdinal; // ordinal table rva + Kernel::UInt32 Characteristics; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt16 MajorVersion; + Kernel::UInt16 MinorVersion; + Kernel::UInt32 Name; + Kernel::UInt32 Base; + Kernel::UInt32 NumberOfFunctions; + Kernel::UInt32 NumberOfNames; + Kernel::UInt32 AddressOfFunctions; // export table rva + Kernel::UInt32 AddressOfNames; + Kernel::UInt32 AddressOfNameOrdinal; // ordinal table rva } LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR; typedef struct LDR_IMPORT_DIRECTORY { union { - NeOS::UInt32 Characteristics; - NeOS::UInt32 OriginalFirstThunk; + Kernel::UInt32 Characteristics; + Kernel::UInt32 OriginalFirstThunk; }; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt32 ForwarderChain; - NeOS::UInt32 NameRva; - NeOS::UInt32 ThunkTableRva; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt32 ForwarderChain; + Kernel::UInt32 NameRva; + Kernel::UInt32 ThunkTableRva; } LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR; typedef struct LDR_DATA_DIRECTORY { - NeOS::UInt32 VirtualAddress; - NeOS::UInt32 Size; + Kernel::UInt32 VirtualAddress; + Kernel::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 dfdaed12..7b099d04 100644 --- a/dev/kernel/KernelKit/PEF.h +++ b/dev/kernel/KernelKit/PEF.h @@ -44,7 +44,7 @@ #define kPefForkKind kPefMagic #define kPefForkKindFAT kPefMagicFat -namespace NeOS +namespace Kernel { enum { @@ -112,6 +112,6 @@ namespace NeOS kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace NeOS +} // namespace Kernel #endif /* ifndef KERNELKIT_PEF_H */ diff --git a/dev/kernel/KernelKit/PEFCodeMgr.h b/dev/kernel/KernelKit/PEFCodeMgr.h index 47aea432..aa82f84d 100644 --- a/dev/kernel/KernelKit/PEFCodeMgr.h +++ b/dev/kernel/KernelKit/PEFCodeMgr.h @@ -18,7 +18,7 @@ #define kPefApplicationMime "application/vnd-zka-executable" -namespace NeOS +namespace Kernel { /// /// \name PEFLoader @@ -67,6 +67,6 @@ namespace NeOS { ProcessID rtl_create_process(PEFLoader& exec, const Int32& procKind) noexcept; } // namespace Utils -} // namespace NeOS +} // namespace Kernel #endif // ifndef _INC_CODE_MANAGER_PEF_H_ diff --git a/dev/kernel/KernelKit/Semaphore.h b/dev/kernel/KernelKit/Semaphore.h index ac810c62..dffa1747 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 NeOS +namespace Kernel { typedef Int64 Semaphore; -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.h b/dev/kernel/KernelKit/ThreadLocalStorage.h index 573b40b8..98747ca7 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 { - NeOS::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - NeOS::VoidPtr Record{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + Kernel::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. -NeOS::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); +Kernel::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> -NeOS::Boolean tls_delete_ptr(T* ptr) noexcept; +Kernel::Boolean tls_delete_ptr(T* ptr) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept; +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 NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept; +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept; template <typename T, typename... Args> T* tls_new_class(Args&&... args); /// @brief TLS install TIB and PIB. (syscall) -EXTERN_C NeOS::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); +EXTERN_C Kernel::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); /// @brief TLS check (syscall) -EXTERN_C NeOS::Bool tls_check_syscall_impl(NeOS::VoidPtr TIB) noexcept; +EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.inl b/dev/kernel/KernelKit/ThreadLocalStorage.inl index d912f5aa..0517dada 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 NeOS; + using namespace Kernel; 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 NeOS::Bool tls_delete_ptr(T* obj) noexcept +inline Kernel::Bool tls_delete_ptr(T* obj) noexcept { - using namespace NeOS; + using namespace Kernel; if (!obj) return No; @@ -48,7 +48,7 @@ inline NeOS::Bool tls_delete_ptr(T* obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept { return tls_delete_ptr(obj.Leak()); } @@ -56,7 +56,7 @@ 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 NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept { return tls_delete_ptr(obj->Leak()); } @@ -69,7 +69,7 @@ inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept template <typename T, typename... Args> T* tls_new_class(Args&&... args) { - using namespace NeOS; + using namespace Kernel; T* obj = tls_new_ptr<T>(); @@ -87,9 +87,9 @@ T* tls_new_class(Args&&... args) /// @param obj /// @return template <typename T> -inline NeOS::Bool tls_delete_class(T* obj) +inline Kernel::Bool tls_delete_class(T* obj) { - using namespace NeOS; + using namespace Kernel; if (!obj) return No; diff --git a/dev/kernel/KernelKit/Timer.h b/dev/kernel/KernelKit/Timer.h index e52f91e7..1e96f263 100644 --- a/dev/kernel/KernelKit/Timer.h +++ b/dev/kernel/KernelKit/Timer.h @@ -9,7 +9,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/KPC.h> -namespace NeOS +namespace Kernel { class SoftwareTimer; class TimerInterface; @@ -80,4 +80,4 @@ namespace NeOS return kTimeUnit * rtl_ms(time); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/User.h b/dev/kernel/KernelKit/User.h index 620b9bc9..3127f785 100644 --- a/dev/kernel/KernelKit/User.h +++ b/dev/kernel/KernelKit/User.h @@ -31,7 +31,7 @@ #define kMaxUserNameLen (256U) #define kMaxUserTokenLen (256U) -namespace NeOS +namespace Kernel { class User; @@ -90,6 +90,6 @@ namespace NeOS Char mUserName[kMaxUserNameLen] = {0}; Char mUserKey[kMaxUserTokenLen] = {0}; }; -} // namespace NeOS +} // namespace Kernel #endif /* ifndef INC_USER_H */ diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h index a2006db1..dc90dc96 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.h +++ b/dev/kernel/KernelKit/UserProcessScheduler.h @@ -13,22 +13,21 @@ #include <NewKit/MutableArray.h> #define kSchedMinMicroTime (AffinityKind::kStandard) -#define kSchedInvalidPID (-1) +#define kSchedInvalidPID ((PID)~0) #define kSchedProcessLimitPerTeam (32U) #define kSchedMaxMemoryLimit gib_cast(128) /* max physical memory limit */ #define kSchedMaxStackSz mib_cast(8) /* maximum stack size */ -#define kProcessInvalidID (-1) -#define kProcessNameLen (128U) +#define kSchedNameLen (128U) //////////////////////////////////////////////////// -// The current date is: Thu 11/28/2024 // +// Last revision date is: Fri Mar 28 2025 // //////////////////////////////////////////////////// -namespace NeOS +namespace Kernel { - //! @note Forward class declarations. + //! @note Forward class declaration. class IDylibObject; class UserProcess; @@ -121,7 +120,7 @@ namespace NeOS }; using ProcessTime = UInt64; - using PID = Int64; + using PID = UInt64; /***********************************************************************************/ /// @note For User manager, tells where we run the code. @@ -171,7 +170,7 @@ namespace NeOS NE_COPY_DEFAULT(UserProcess); public: - Char Name[kProcessNameLen] = {"Process"}; + Char Name[kSchedNameLen] = {"Process"}; ProcessSubsystem SubSystem{ProcessSubsystem::kProcessSubsystemInvalid}; User* Owner{nullptr}; HAL::StackFramePtr StackFrame{nullptr}; @@ -368,7 +367,7 @@ namespace NeOS }; const UInt32& sched_get_exit_code(void) noexcept; -} // namespace NeOS +} // namespace Kernel #include <KernelKit/ThreadLocalStorage.h> #include <KernelKit/UserProcessScheduler.inl> diff --git a/dev/kernel/KernelKit/UserProcessScheduler.inl b/dev/kernel/KernelKit/UserProcessScheduler.inl index 6b3b9300..4b3d5820 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.inl +++ b/dev/kernel/KernelKit/UserProcessScheduler.inl @@ -7,7 +7,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { /***********************************************************************************/ /** @brief Free pointer from usage. */ @@ -59,4 +59,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/XCOFF.h b/dev/kernel/KernelKit/XCOFF.h index 5e59e717..037a52bb 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 { - 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 + 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 } XCoffFileHeader64; #define kForkNameLen (256U) @@ -43,9 +43,9 @@ typedef struct XCoffFileHeader /// @brief This the executable manifest fork. typedef struct XCoffForkHeader { - NeOS::Char fPropertiesXMLFork[kForkNameLen]; - NeOS::Char fDynamicLoaderFork[kForkNameLen]; - NeOS::Char fCodeSignFork[kForkNameLen]; + Kernel::Char fPropertiesXMLFork[kForkNameLen]; + Kernel::Char fDynamicLoaderFork[kForkNameLen]; + Kernel::Char fCodeSignFork[kForkNameLen]; } XCoffForkHeader; #endif // ifndef INC_XOCFF_H diff --git a/dev/kernel/NetworkKit/IP.h b/dev/kernel/NetworkKit/IP.h index 4a552d87..6297055e 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 NeOS +namespace Kernel { class RawIPAddress6; class RawIPAddress; @@ -80,4 +80,4 @@ namespace NeOS static ErrorOr<KString> ToKString(Ref<RawIPAddress>& ipv4); static bool IpCheckVersion4(const Char* ip); }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NetworkKit/IPC.h b/dev/kernel/NetworkKit/IPC.h index cbb9ddd4..9a3e77e6 100644 --- a/dev/kernel/NetworkKit/IPC.h +++ b/dev/kernel/NetworkKit/IPC.h @@ -25,7 +25,7 @@ #define kIPCHeaderMagic (0x4950434) -namespace NeOS +namespace Kernel { struct IPC_ADDR; struct IPC_MSG; @@ -86,6 +86,6 @@ namespace NeOS /// @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 NeOS +} // namespace Kernel #endif // INC_IPC_H diff --git a/dev/kernel/NetworkKit/MAC.h b/dev/kernel/NetworkKit/MAC.h index f7283708..527d9b1f 100644 --- a/dev/kernel/NetworkKit/MAC.h +++ b/dev/kernel/NetworkKit/MAC.h @@ -12,7 +12,7 @@ #define kMACAddrLen (12) -namespace NeOS +namespace Kernel { class MacAddressGetter; @@ -33,4 +33,4 @@ namespace NeOS Array<WideChar, kMACAddrLen> fMacAddress; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NetworkKit/NetworkDevice.h b/dev/kernel/NetworkKit/NetworkDevice.h index c95573f3..ca11fdbb 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 NeOS +namespace Kernel { struct NetworkDeviceCommand; class NetworkDevice; @@ -76,7 +76,7 @@ namespace NeOS /// @brief LTE device. using LTENetworkDevice = NetworkDevice; -} // namespace NeOS +} // namespace Kernel #include <NetworkKit/NetworkDevice.inl> diff --git a/dev/kernel/NetworkKit/NetworkDevice.inl b/dev/kernel/NetworkKit/NetworkDevice.inl index dceae66e..52e5f036 100644 --- a/dev/kernel/NetworkKit/NetworkDevice.inl +++ b/dev/kernel/NetworkKit/NetworkDevice.inl @@ -8,7 +8,7 @@ Dtor and ctors. */ -namespace NeOS +namespace Kernel { NetworkDevice::NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand), void (*in)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand), @@ -29,4 +29,4 @@ namespace NeOS if (fCleanup) fCleanup(); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Array.h b/dev/kernel/NewKit/Array.h index 54c09636..43c67586 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 NeOS +namespace Kernel { template <typename T, SizeT N> class Array final @@ -62,4 +62,4 @@ namespace NeOS { return Array<ValueType, ARRAY_SIZE(val)>{val}; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/ArrayList.h b/dev/kernel/NewKit/ArrayList.h index 06763b5a..e05480f0 100644 --- a/dev/kernel/NewKit/ArrayList.h +++ b/dev/kernel/NewKit/ArrayList.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { template <typename T> class ArrayList final @@ -60,4 +60,4 @@ namespace NeOS { return ArrayList<ValueType>{val}; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Atom.h b/dev/kernel/NewKit/Atom.h index 3979b0d1..7c908cba 100644 --- a/dev/kernel/NewKit/Atom.h +++ b/dev/kernel/NewKit/Atom.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { template <typename T> class Atom final @@ -44,4 +44,4 @@ namespace NeOS private: T fArrayOfAtoms; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Crc32.h b/dev/kernel/NewKit/Crc32.h index c3e14413..adc2e7a2 100644 --- a/dev/kernel/NewKit/Crc32.h +++ b/dev/kernel/NewKit/Crc32.h @@ -15,9 +15,9 @@ #define kCrcCnt (256) -namespace NeOS +namespace Kernel { UInt32 ke_calculate_crc32(const Char* crc, Int32 len) noexcept; -} // namespace NeOS +} // namespace Kernel #endif // !CRC32_H diff --git a/dev/kernel/NewKit/Defines.h b/dev/kernel/NewKit/Defines.h index 7758c053..33759784 100644 --- a/dev/kernel/NewKit/Defines.h +++ b/dev/kernel/NewKit/Defines.h @@ -12,7 +12,7 @@ #define NEWKIT_VERSION_BCD 0x01100 #ifndef __cplusplus -#error NeOS compiles with a C++ compiler. +#error Kernel compiles with a C++ compiler. #endif #if __cplusplus <= 201703L @@ -28,7 +28,7 @@ #endif /// @brief The **Kernel** namespace. -namespace NeOS +namespace Kernel { using voidPtr = void*; using VoidPtr = void*; @@ -197,4 +197,4 @@ namespace NeOS return NO; } }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/ErrorOr.h b/dev/kernel/NewKit/ErrorOr.h index 7c879cc8..fb50b21f 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 NeOS +namespace Kernel { using ErrorT = UInt; @@ -79,4 +79,4 @@ namespace NeOS using ErrorOrAny = ErrorOr<voidPtr>; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Function.h b/dev/kernel/NewKit/Function.h index d25c06c1..9fa218af 100644 --- a/dev/kernel/NewKit/Function.h +++ b/dev/kernel/NewKit/Function.h @@ -3,7 +3,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { template <typename T, typename... Args> class Function final @@ -48,6 +48,6 @@ namespace NeOS T(*fFn) (Args... args); }; -} // namespace NeOS +} // namespace Kernel #endif // !_INC_FUNCTION_H__ diff --git a/dev/kernel/NewKit/Json.h b/dev/kernel/NewKit/Json.h index 7b53fa4a..a376c15a 100644 --- a/dev/kernel/NewKit/Json.h +++ b/dev/kernel/NewKit/Json.h @@ -19,7 +19,7 @@ #define kJSONLen 256 #define kJSONNull "[]" -namespace NeOS +namespace Kernel { /// @brief JavaScript object class class Json final @@ -148,4 +148,4 @@ namespace NeOS }; using JsonStream = Stream<JsonStreamReader, Json>; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/KString.h b/dev/kernel/NewKit/KString.h index e7525a9c..84795c1a 100644 --- a/dev/kernel/NewKit/KString.h +++ b/dev/kernel/NewKit/KString.h @@ -14,7 +14,7 @@ #define cMinimumStringSize 8196 -namespace NeOS +namespace Kernel { /// @brief Kernel string class, not dynamic. class KString final @@ -91,4 +91,4 @@ namespace NeOS static bool Equals(const Char* lhs, const Char* rhs); static bool Equals(const WideChar* lhs, const WideChar* rhs); }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/KernelPanic.h b/dev/kernel/NewKit/KernelPanic.h index 11f9a05d..cd19a1d3 100644 --- a/dev/kernel/NewKit/KernelPanic.h +++ b/dev/kernel/NewKit/KernelPanic.h @@ -9,7 +9,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { void ke_runtime_check(bool expr, const Char* file, const Char* line); } @@ -34,14 +34,14 @@ namespace NeOS #endif #define __MUST_PASS(EXPR, FILE, LINE) \ - NeOS::ke_runtime_check(EXPR, FILE, STRINGIFY(LINE)) + Kernel::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) (NeOS::Void)(EXPR) -#define assert(EXPR) (NeOS::Void)(EXPR) +#define MUST_PASS(EXPR) (Kernel::Void)(EXPR) +#define assert(EXPR) (Kernel::Void)(EXPR) #endif enum RUNTIME_CHECK @@ -68,7 +68,7 @@ enum RUNTIME_CHECK typedef enum RUNTIME_CHECK RTL_RUNTIME_CHECK; -namespace NeOS +namespace Kernel { void ke_panic(const Int32& id, const Char* message = nullptr); -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Macros.h b/dev/kernel/NewKit/Macros.h index 1d270929..660877f6 100644 --- a/dev/kernel/NewKit/Macros.h +++ b/dev/kernel/NewKit/Macros.h @@ -12,41 +12,41 @@ /***********************************************************************************/ #ifndef KIB -#define KIB(X) (NeOS::UInt64)((X) / 1024) +#define KIB(X) (Kernel::UInt64)((X) / 1024) #endif #ifndef kib_cast -#define kib_cast(X) (NeOS::UInt64)((X)*1024) +#define kib_cast(X) (Kernel::UInt64)((X)*1024) #endif #ifndef MIB -#define MIB(X) (NeOS::UInt64)((NeOS::UInt64)KIB(X) / 1024) +#define MIB(X) (Kernel::UInt64)((Kernel::UInt64)KIB(X) / 1024) #endif #ifndef mib_cast -#define mib_cast(X) (NeOS::UInt64)((NeOS::UInt64)kib_cast(X) * 1024) +#define mib_cast(X) (Kernel::UInt64)((Kernel::UInt64)kib_cast(X) * 1024) #endif #ifndef GIB -#define GIB(X) (NeOS::UInt64)((NeOS::UInt64)MIB(X) / 1024) +#define GIB(X) (Kernel::UInt64)((Kernel::UInt64)MIB(X) / 1024) #endif #ifndef gib_cast -#define gib_cast(X) (NeOS::UInt64)((NeOS::UInt64)mib_cast(X) * 1024) +#define gib_cast(X) (Kernel::UInt64)((Kernel::UInt64)mib_cast(X) * 1024) #endif #ifndef TIB -#define TIB(X) (NeOS::UInt64)((NeOS::UInt64)GIB(X) / 1024) +#define TIB(X) (Kernel::UInt64)((Kernel::UInt64)GIB(X) / 1024) #endif #ifndef tib_cast -#define tib_cast(X) ((NeOS::UInt64)gib_cast(X) * 1024) +#define tib_cast(X) ((Kernel::UInt64)gib_cast(X) * 1024) #endif #ifndef ARRAY_SIZE #define ARRAY_SIZE(a) \ (((sizeof(a) / sizeof(*(a))) / \ - (static_cast<NeOS::Size>(!(sizeof(a) % sizeof(*(a))))))) + (static_cast<Kernel::Size>(!(sizeof(a) % sizeof(*(a))))))) #endif #define DEPRECATED ATTRIBUTE(deprecated) @@ -119,10 +119,10 @@ #define CONST const #define STRINGIFY(X) #X -#define NE_UNUSED(X) ((NeOS::Void)X) +#define NE_UNUSED(X) ((Kernel::Void)X) #ifndef RGB -#define RGB(R, G, B) (NeOS::UInt32)(R | G << 0x8 | B << 0x10) +#define RGB(R, G, B) (Kernel::UInt32)(R | G << 0x8 | B << 0x10) #endif // !RGB #ifdef __NE_AMD64__ @@ -132,9 +132,9 @@ #endif #define RTL_ENDIAN(address, value) \ - (((reinterpret_cast<NeOS::Char*>(address)[0]) == (value)) \ - ? (NeOS::Endian::kEndianBig) \ - : (NeOS::Endian::kEndianLittle)) + (((reinterpret_cast<Kernel::Char*>(address)[0]) == (value)) \ + ? (Kernel::Endian::kEndianBig) \ + : (Kernel::Endian::kEndianLittle)) #define Yes true #define No false @@ -145,7 +145,7 @@ #define TRUE true #define FALSE false -#define BOOL NeOS::Boolean +#define BOOL Kernel::Boolean #ifdef RTL_INIT_OBJECT #undef RTL_INIT_OBJECT diff --git a/dev/kernel/NewKit/MutableArray.h b/dev/kernel/NewKit/MutableArray.h index bfb432de..f64c8cad 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 NeOS +namespace Kernel { template <typename T> class MutableArray; @@ -149,7 +149,7 @@ namespace NeOS MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - NeOS::SizeT fNodeCount{0}; + Kernel::SizeT fNodeCount{0}; private: // don't remove that @@ -234,6 +234,6 @@ namespace NeOS MutableLinkedList<T>* fFirstNode{nullptr}; /* Number of nodes inside of this dynamic array. */ - NeOS::SizeT fNodeCount{0}; + Kernel::SizeT fNodeCount{0}; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/OwnPtr.h b/dev/kernel/NewKit/OwnPtr.h index 169f16d9..5df29d7f 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 NeOS +namespace Kernel { template <typename T> class OwnPtr; @@ -91,4 +91,4 @@ namespace NeOS return ret; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/PageMgr.h b/dev/kernel/NewKit/PageMgr.h index 00638f8a..e6376233 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 NeOS +namespace Kernel { class PageMgr; @@ -78,4 +78,4 @@ namespace NeOS friend PTEWrapper; friend class Pmm; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Pair.h b/dev/kernel/NewKit/Pair.h index 05a95ff3..74ebf54c 100644 --- a/dev/kernel/NewKit/Pair.h +++ b/dev/kernel/NewKit/Pair.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { class Pair; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Pmm.h b/dev/kernel/NewKit/Pmm.h index 97bdc0eb..5b90628d 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 NeOS +namespace Kernel { class Pmm; class PTEWrapper; @@ -41,4 +41,4 @@ namespace NeOS private: Ref<PageMgr> fPageMgr; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Ref.h b/dev/kernel/NewKit/Ref.h index e41bf3bc..45bcf95a 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 NeOS +namespace Kernel { template <typename T> class Ref final @@ -103,6 +103,6 @@ namespace NeOS private: Ref<T> fRef{nullptr}; }; -} // namespace NeOS +} // namespace Kernel #endif // ifndef _NEWKIT_REF_H_ diff --git a/dev/kernel/NewKit/Stream.h b/dev/kernel/NewKit/Stream.h index 541d3389..9a23664d 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 NeOS +namespace Kernel { template <typename StreamTrait, typename Kind> class Stream final @@ -55,4 +55,4 @@ namespace NeOS Ref<StreamTrait> fStream; Ref<Kind> fKind; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Utils.h b/dev/kernel/NewKit/Utils.h index 3df823ef..b455dfce 100644 --- a/dev/kernel/NewKit/Utils.h +++ b/dev/kernel/NewKit/Utils.h @@ -9,7 +9,7 @@ #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { 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 NeOS 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 NeOS +} // namespace Kernel diff --git a/dev/kernel/NewKit/Variant.h b/dev/kernel/NewKit/Variant.h index 3fa04496..6a0dc1f7 100644 --- a/dev/kernel/NewKit/Variant.h +++ b/dev/kernel/NewKit/Variant.h @@ -11,7 +11,7 @@ #include <NewKit/Json.h> #include <SwapKit/DiskSwap.h> -namespace NeOS +namespace Kernel { class Variant final { @@ -77,4 +77,4 @@ namespace NeOS voidPtr fPtr{nullptr}; VariantKind fKind{VariantKind::kNull}; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/SignalKit/Signals.h b/dev/kernel/SignalKit/Signals.h index affec3ee..4c293b78 100644 --- a/dev/kernel/SignalKit/Signals.h +++ b/dev/kernel/SignalKit/Signals.h @@ -19,7 +19,7 @@ #define SIGATCH 661 #define SIGDTCH 662 -namespace NeOS +namespace Kernel { typedef UInt32 SignalKind; }
\ No newline at end of file diff --git a/dev/kernel/StorageKit/AHCI.h b/dev/kernel/StorageKit/AHCI.h index 43e81ba0..24191dbe 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 NeOS +namespace Kernel { class AHCIDeviceInterface NE_DEVICE<MountpointInterface*> { @@ -57,4 +57,4 @@ namespace NeOS UInt16 sk_init_ahci_device(BOOL atapi); ErrorOr<AHCIDeviceInterface> sk_acquire_ahci_device(Int32 drv_index); -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/StorageKit/ATA.h b/dev/kernel/StorageKit/ATA.h index 5698fe85..562b22b6 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 NeOS +namespace Kernel { /// @brief ATA device interface type. class ATADeviceInterface : public IDeviceObject<MountpointInterface*> @@ -36,4 +36,4 @@ namespace NeOS private: void (*fCleanup)(void) = {nullptr}; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/StorageKit/NVME.h b/dev/kernel/StorageKit/NVME.h index 22300726..748bb02a 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 NeOS +namespace Kernel { class NVMEDeviceInterface final NE_DEVICE<MountpointInterface*> { @@ -31,4 +31,4 @@ namespace NeOS private: Void (*fCleanup)(Void) = {nullptr}; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/StorageKit/PRDT.h b/dev/kernel/StorageKit/PRDT.h index 40ba11e0..603d4f23 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(NeOS::UShort)) +#define kPrdtTransferSize (sizeof(Kernel::UShort)) -namespace NeOS +namespace Kernel { /// @brief Tranfer information about PRD. enum kPRDTTransfer @@ -33,4 +33,4 @@ namespace NeOS void construct_prdt(Ref<PRDT>& prd); EXTERN_C Int32 kPRDTTransferStatus; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/StorageKit/StorageKit.h b/dev/kernel/StorageKit/StorageKit.h index a0f1a2d1..954d368b 100644 --- a/dev/kernel/StorageKit/StorageKit.h +++ b/dev/kernel/StorageKit/StorageKit.h @@ -10,7 +10,7 @@ #define kDriveSectorSizeSSD (512U) #define kDriveSectorSizeOptical (2048) -namespace NeOS +namespace Kernel { template <typename T> class IDeviceObject; @@ -19,4 +19,4 @@ namespace NeOS class AHCIDeviceInterface; class ATADeviceInterface; class SCSIDeviceInterface; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/SwapKit/DiskSwap.h b/dev/kernel/SwapKit/DiskSwap.h index b9c31a65..f9b39cf6 100644 --- a/dev/kernel/SwapKit/DiskSwap.h +++ b/dev/kernel/SwapKit/DiskSwap.h @@ -16,7 +16,7 @@ /// @file SwapDisk.h /// @brief Virtual memory swap disk. -namespace NeOS +namespace Kernel { struct SWAP_DISK_HEADER; @@ -67,4 +67,4 @@ namespace NeOS SizeT fBlobSz; UInt8 fBlob[]; } PACKED SWAP_DISK_HEADER; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/arm64-mobile.make b/dev/kernel/arm64-mobile.make deleted file mode 100644 index 1b3521d5..00000000 --- a/dev/kernel/arm64-mobile.make +++ /dev/null @@ -1,64 +0,0 @@ -################################################## -# (c) Amlal EL Mahrouss, all rights reserved. -# This is the microKernel makefile. -################################################## - -CC = clang++ -LD = lld-link -CCFLAGS = -fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__NE_ARM64__ -fno-rtti -fno-exceptions -I./ \ - -target aarch64-unknown-windows \ - -std=c++20 -O3 -D__NEOSKRNL__ -D__NE_MINIMAL_OS__ -D__NE_NO_BUILTIN__ -D__HAVE_NE_APIS__ -D__NE__ -I../ - -ASM = clang++ - -DISKDRIVER = -D__USE_FLASH_MEM__ - -ifneq ($(DEBUG_SUPPORT), ) -DEBUG = -D__DEBUG__ -endif - -COPY = cp - -LDFLAGS = -subsystem:efi_application -entry:hal_init_platform /nodefaultlib -LDOBJ = obj/*.obj - -# This file is the Kernel, responsible of task management and memory. -KERNEL = neoskrnl.exe - -.PHONY: error -error: - @echo "=== ERROR ===" - @echo "=> Use a specific target." - -MOVEALL=./MoveAll.ARM64.sh - -.PHONY: newos-arm64-epm -newos-arm64-epm: clean - $(CC) $(CCFLAGS) $(DISKDRIVER) $(DEBUG) $(wildcard src/*.cc) \ - $(wildcard src/FS/*.cc) $(wildcard HALKit/ARM64/Storage/*.cc) \ - $(wildcard HALKit/ARM64/PCI/*.cc) $(wildcard src/Network/*.cc) $(wildcard src/Storage/*.cc) \ - $(wildcard HALKit/ARM64/*.cc) $(wildcard HALKit/ARM64/*.cpp) \ - $(wildcard HALKit/ARM64/*.s) $(wildcard HALKit/ARM64/APM/*.cc) - - $(MOVEALL) - -OBJCOPY=x86_64-w64-mingw32-objcopy - -.PHONY: link-arm64-epm -link-arm64-epm: - $(LD) $(LDFLAGS) $(LDOBJ) /out:$(KERNEL) - -.PHONY: all -all: newos-arm64-epm link-arm64-epm - @echo "Kernel => OK." - -.PHONY: help -help: - @echo "=== HELP ===" - @echo "all: Build Kernel and link it." - @echo "link-arm64-epm: Link Kernel for EPM based disks." - @echo "newos-arm64-epm: Build Kernel for EPM based disks." - -.PHONY: clean -clean: - rm -f $(LDOBJ) $(wildcard *.o) $(KERNEL) diff --git a/dev/kernel/src/ACPIFactoryInterface.cc b/dev/kernel/src/ACPIFactoryInterface.cc index 3cc76e44..b744ed4d 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 NeOS +namespace Kernel { /// @brief Finds a descriptor table inside ACPI XSDT. ErrorOr<voidPtr> ACPIFactoryInterface::Find(const Char* signature) @@ -98,4 +98,4 @@ namespace NeOS { return this->Find(signature); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/BinaryMutex.cc b/dev/kernel/src/BinaryMutex.cc index 4fdaa8f4..6426e5df 100644 --- a/dev/kernel/src/BinaryMutex.cc +++ b/dev/kernel/src/BinaryMutex.cc @@ -7,7 +7,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/BinaryMutex.h> -namespace NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Unlocks the semaphore. @@ -71,4 +71,4 @@ namespace NeOS return !this->IsLocked(); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/BitMapMgr.cc b/dev/kernel/src/BitMapMgr.cc index f65df8c6..e55d4ca4 100644 --- a/dev/kernel/src/BitMapMgr.cc +++ b/dev/kernel/src/BitMapMgr.cc @@ -22,7 +22,7 @@ #define kBitMapSizeIdx (1U) #define kBitMapUsedIdx (2U) -namespace NeOS +namespace Kernel { namespace HAL { @@ -207,4 +207,4 @@ namespace NeOS return ret; } } // namespace HAL -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/CodeMgr.cc b/dev/kernel/src/CodeMgr.cc index c639155d..37c5b726 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 NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Executes a new process from a function. Kernel code only. @@ -21,8 +21,8 @@ namespace NeOS { if (!process_name || *process_name == 0) - return kProcessInvalidID; + return kSchedInvalidPID; return UserProcessScheduler::The().Spawn(process_name, reinterpret_cast<VoidPtr>(main), nullptr); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Crc32.cc b/dev/kernel/src/Crc32.cc index 98821602..0e635afb 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 NeOS +namespace Kernel { /// @brief The CRC32 seed table. UInt32 kCrcTbl[kCrcCnt] = { @@ -79,4 +79,4 @@ namespace NeOS return ~crc; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/CxxAbi-AMD64.cc b/dev/kernel/src/CxxAbi-AMD64.cc index 555c613f..7341b71c 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. -NeOS::UIntPtr __dso_handle; +Kernel::UIntPtr __dso_handle; -EXTERN_C NeOS::Void __cxa_pure_virtual(void* self) +EXTERN_C Kernel::Void __cxa_pure_virtual(void* self) { - kout << "object: " << NeOS::number(reinterpret_cast<NeOS::UIntPtr>(self)); + kout << "object: " << Kernel::number(reinterpret_cast<Kernel::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 a24dfce3..833fd534 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. -NeOS::UIntPtr __dso_handle; +Kernel::UIntPtr __dso_handle; EXTERN_C void __chkstk(void) { @@ -81,27 +81,27 @@ namespace cxxabiv1 } } // namespace cxxabiv1 -EXTERN_C NeOS::Void _purecall(void* self) +EXTERN_C Kernel::Void _purecall(void* self) { - kout << "object: " << NeOS::number(reinterpret_cast<NeOS::UIntPtr>(self)); + kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self)); kout << ", has unimplemented virtual functions.\r"; } -EXTERN_C NeOS::Void _Init_thread_footer(NeOS::Int* thread_obj) +EXTERN_C Kernel::Void _Init_thread_footer(Kernel::Int* thread_obj) { NE_UNUSED(thread_obj); } -EXTERN_C NeOS::Void _Init_thread_epoch(NeOS::Void) +EXTERN_C Kernel::Void _Init_thread_epoch(Kernel::Void) { NE_UNUSED(0); } -EXTERN_C NeOS::Void _Init_thread_header(NeOS::Int* thread_obj) +EXTERN_C Kernel::Void _Init_thread_header(Kernel::Int* thread_obj) { NE_UNUSED(0); } -EXTERN_C NeOS::Int _tls_index = 0UL; +EXTERN_C Kernel::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 8381087f..d46c2a9a 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 NeOS +namespace Kernel { /// @brief Read from newfs disk. /// @param Mnt mounted interface. @@ -93,4 +93,4 @@ namespace NeOS return DrvTrait.fPacket.fPacketGood; } -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/src/DriveMgr.cc b/dev/kernel/src/DriveMgr.cc index 039f7e08..f4741fa6 100644 --- a/dev/kernel/src/DriveMgr.cc +++ b/dev/kernel/src/DriveMgr.cc @@ -17,7 +17,7 @@ /// @brief Drive Manager of kernel. /***********************************************************************************/ -namespace NeOS +namespace Kernel { #if defined(__ATA_PIO__) || defined(__ATA_DMA__) STATIC UInt16 kATAIO = 0U; @@ -232,4 +232,4 @@ namespace NeOS return trait; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/FS/NeFS+FileMgr.cc b/dev/kernel/src/FS/NeFS+FileMgr.cc index 0ac6384d..c7fdab14 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 NeOS +namespace Kernel { /// @brief C++ constructor NeFileSystemMgr::NeFileSystemMgr() @@ -239,7 +239,7 @@ namespace NeOS { return mParser; } -} // namespace NeOS +} // namespace Kernel #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 29636337..2e7cfbe7 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -20,7 +20,7 @@ #include <KernelKit/User.h> #include <KernelKit/DriveMgr.h> -using namespace NeOS; +using namespace Kernel; #ifdef __NE_NO_BUILTIN__ /***********************************************************************************/ @@ -32,12 +32,12 @@ using namespace NeOS; /***********************************************************************************/ /// @brief get sector count. /***********************************************************************************/ -NeOS::SizeT drv_get_sector_count(); +Kernel::SizeT drv_get_sector_count(); /***********************************************************************************/ /// @brief get device size. /***********************************************************************************/ -NeOS::SizeT drv_get_size(); +Kernel::SizeT drv_get_size(); #endif @@ -1043,7 +1043,7 @@ SizeT NeFileSystemParser::Tell(_Input _Output NEFS_CATALOG_STRUCT* catalog) return 0; } -namespace NeOS::NeFS +namespace Kernel::NeFS { /***********************************************************************************/ /// @brief Construct NeFS drives. @@ -1059,6 +1059,6 @@ namespace NeOS::NeFS return YES; } -} // namespace NeOS::NeFS +} // namespace Kernel::NeFS #endif // ifdef __FSKIT_INCLUDES_NEFS__ diff --git a/dev/kernel/src/FileMgr.cc b/dev/kernel/src/FileMgr.cc index b803253d..9708038a 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 NeOS +namespace Kernel { STATIC IFilesystemMgr* kMountedFilesystem = nullptr; @@ -49,4 +49,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/HardwareThreadScheduler.cc b/dev/kernel/src/HardwareThreadScheduler.cc index 70502d40..1aa990ac 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 NeOS +namespace Kernel { /***********************************************************************************/ /// @note Those symbols are needed in order to switch and validate the stack. @@ -222,4 +222,4 @@ namespace NeOS { return fThreadList.Count(); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/IDylibObject.cc b/dev/kernel/src/IDylibObject.cc index 30a76af9..c760fe57 100644 --- a/dev/kernel/src/IDylibObject.cc +++ b/dev/kernel/src/IDylibObject.cc @@ -12,4 +12,4 @@ #include <KernelKit/UserProcessScheduler.h> -using namespace NeOS; +using namespace Kernel; diff --git a/dev/kernel/src/IPEFDylibObject.cc b/dev/kernel/src/IPEFDylibObject.cc index e994ad29..29fe578e 100644 --- a/dev/kernel/src/IPEFDylibObject.cc +++ b/dev/kernel/src/IPEFDylibObject.cc @@ -30,7 +30,7 @@ ------------------------------------------- */ -using namespace NeOS; +using namespace Kernel; /***********************************************************************************/ /// @file IPEFDylibObject.cc diff --git a/dev/kernel/src/IndexableProperty.cc b/dev/kernel/src/IndexableProperty.cc index 8d3637f4..a3e0749f 100644 --- a/dev/kernel/src/IndexableProperty.cc +++ b/dev/kernel/src/IndexableProperty.cc @@ -14,7 +14,7 @@ #define kMaxLenIndexer (256U) -namespace NeOS +namespace Kernel { namespace Indexer { @@ -54,4 +54,4 @@ namespace NeOS } } } // namespace Indexer -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Json.cc b/dev/kernel/src/Json.cc index 48567b5f..2e0a1465 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(NeOS::Json::kNull, NeOS::Json); +RTL_INIT_OBJECT(Kernel::Json::kNull, Kernel::Json); diff --git a/dev/kernel/src/KPC.cc b/dev/kernel/src/KPC.cc index 7081bf51..9e0e134e 100644 --- a/dev/kernel/src/KPC.cc +++ b/dev/kernel/src/KPC.cc @@ -8,7 +8,7 @@ #include <NewKit/KernelPanic.h> #include <KernelKit/MemoryMgr.h> -namespace NeOS +namespace Kernel { STATIC Bool kRaiseOnBugCheck = false; @@ -42,4 +42,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/KString.cc b/dev/kernel/src/KString.cc index d96ef38c..a92906a5 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 NeOS +namespace Kernel { Char* KString::Data() { @@ -215,4 +215,4 @@ namespace NeOS return *this; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/LockDelegate.cc b/dev/kernel/src/LockDelegate.cc index df62c6f3..4497ec83 100644 --- a/dev/kernel/src/LockDelegate.cc +++ b/dev/kernel/src/LockDelegate.cc @@ -6,7 +6,7 @@ #include <KernelKit/LockDelegate.h> -namespace NeOS +namespace Kernel { /// @note Leave it empty for now. -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/MemoryMgr.cc b/dev/kernel/src/MemoryMgr.cc index 271dfa23..9eea4187 100644 --- a/dev/kernel/src/MemoryMgr.cc +++ b/dev/kernel/src/MemoryMgr.cc @@ -28,7 +28,7 @@ #define kMemoryMgrMagic (0xD4D75) #define kMemoryMgrAlignSz (4) -namespace NeOS +namespace Kernel { /// @brief Implementation details. namespace Detail @@ -292,4 +292,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Network/IPAddr.cc b/dev/kernel/src/Network/IPAddr.cc index 6f523086..c59e9625 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 NeOS +namespace Kernel { Char* RawIPAddress::Address() { @@ -126,4 +126,4 @@ namespace NeOS return true; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Network/IPCAddr.cc b/dev/kernel/src/Network/IPCAddr.cc index fb2d785a..11466c7e 100644 --- a/dev/kernel/src/Network/IPCAddr.cc +++ b/dev/kernel/src/Network/IPCAddr.cc @@ -8,7 +8,7 @@ #include <KernelKit/KPC.h> #include <KernelKit/UserProcessScheduler.h> -namespace NeOS +namespace Kernel { bool IPC_ADDR::operator==(const IPC_ADDR& addr) noexcept { @@ -29,4 +29,4 @@ namespace NeOS { return addr.UserProcessID != this->UserProcessID || addr.UserProcessTeam != this->UserProcessTeam; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Network/IPCMsg.cc b/dev/kernel/src/Network/IPCMsg.cc index 5c18fe9c..288cfb6d 100644 --- a/dev/kernel/src/Network/IPCMsg.cc +++ b/dev/kernel/src/Network/IPCMsg.cc @@ -8,7 +8,7 @@ #include <KernelKit/KPC.h> #include <KernelKit/UserProcessScheduler.h> -namespace NeOS +namespace Kernel { /// @internal internal use for IPC system only. /// @brief The internal sanitize function. @@ -122,4 +122,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Network/MACAddressGetter.cc b/dev/kernel/src/Network/MACAddressGetter.cc index 627bcd34..b5b01293 100644 --- a/dev/kernel/src/Network/MACAddressGetter.cc +++ b/dev/kernel/src/Network/MACAddressGetter.cc @@ -6,10 +6,10 @@ #include <NetworkKit/MAC.h> -namespace NeOS +namespace Kernel { Array<WideChar, kMACAddrLen>& MacAddressGetter::AsBytes() { return this->fMacAddress; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Network/NetworkDevice.cc b/dev/kernel/src/Network/NetworkDevice.cc index f2971265..74df8e7e 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 NeOS +namespace Kernel { /// \brief Getter for fNetworkName. const Char* NetworkDevice::Name() const @@ -32,4 +32,4 @@ namespace NeOS return YES; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/New+Delete.cc b/dev/kernel/src/New+Delete.cc index 1e0a3421..bb98154e 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 NeOS::mm_new_heap(sz, true, false); + return Kernel::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 NeOS::mm_new_heap(sz, true, false); + return Kernel::mm_new_heap(sz, true, false); } void operator delete[](void* ptr) @@ -28,7 +28,7 @@ void operator delete[](void* ptr) if (ptr == nullptr) return; - NeOS::mm_delete_heap(ptr); + Kernel::mm_delete_heap(ptr); } void operator delete(void* ptr) @@ -36,7 +36,7 @@ void operator delete(void* ptr) if (ptr == nullptr) return; - NeOS::mm_delete_heap(ptr); + Kernel::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); - NeOS::mm_delete_heap(ptr); + Kernel::mm_delete_heap(ptr); } diff --git a/dev/kernel/src/PEFCodeMgr.cc b/dev/kernel/src/PEFCodeMgr.cc index 426a1e26..b8139439 100644 --- a/dev/kernel/src/PEFCodeMgr.cc +++ b/dev/kernel/src/PEFCodeMgr.cc @@ -18,7 +18,7 @@ #define kPefHeapSizeSymbol "__PEFSizeOfReserveHeap" #define kPefNameSymbol "__PEFProgramName" -namespace NeOS +namespace Kernel { namespace Detail { @@ -251,11 +251,11 @@ namespace NeOS auto errOrStart = exec.FindStart(); if (errOrStart.Error() != kErrorSuccess) - return kProcessInvalidID; + return kSchedInvalidPID; auto id = UserProcessScheduler::The().Spawn(reinterpret_cast<const Char*>(exec.FindSymbol(kPefNameSymbol, kPefData)), errOrStart.Leak().Leak(), exec.GetBlob().Leak().Leak()); - if (id != kProcessInvalidID) + if (id != kSchedInvalidPID) { UserProcessScheduler::The().CurrentTeam().AsArray()[id].Kind = process_kind; UserProcessScheduler::The().CurrentTeam().AsArray()[id].StackSize = *(UIntPtr*)exec.FindSymbol(kPefStackSizeSymbol, kPefData); @@ -265,4 +265,4 @@ namespace NeOS return id; } } // namespace Utils -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/PRDT.cc b/dev/kernel/src/PRDT.cc index 9ea3e70b..8836ec08 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 NeOS +namespace Kernel { /***********************************************************************************/ /// @brief constructs a new PRD. @@ -21,4 +21,4 @@ namespace NeOS prd.Leak().fSectorCount = 0x0; prd.Leak().fEndBit = 0x0; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/PageMgr.cc b/dev/kernel/src/PageMgr.cc index 6a8622ed..a2c6989b 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 NeOS +namespace Kernel { PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) : fRw(Rw), @@ -60,7 +60,7 @@ namespace NeOS PTEWrapper PageMgr::Request(Boolean Rw, Boolean User, Boolean ExecDisable, SizeT Sz, SizeT Pad) { // Store PTE wrapper right after PTE. - VoidPtr ptr = NeOS::HAL::mm_alloc_bitmap(Rw, User, Sz, NO, Pad); + VoidPtr ptr = Kernel::HAL::mm_alloc_bitmap(Rw, User, Sz, NO, Pad); return PTEWrapper{Rw, User, ExecDisable, reinterpret_cast<UIntPtr>(ptr)}; } @@ -70,7 +70,7 @@ namespace NeOS /// @return If the page bitmap was cleared or not. Bool PageMgr::Free(Ref<PTEWrapper>& wrapper) { - if (!NeOS::HAL::mm_free_bitmap((VoidPtr)wrapper.Leak().VirtualAddress())) + if (!Kernel::HAL::mm_free_bitmap((VoidPtr)wrapper.Leak().VirtualAddress())) return false; return true; @@ -107,4 +107,4 @@ namespace NeOS { return fExecDisable; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Pmm.cc b/dev/kernel/src/Pmm.cc index a5ba0dcd..597b8f83 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 NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Pmm constructor. @@ -95,4 +95,4 @@ namespace NeOS return true; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/SoftwareTimer.cc b/dev/kernel/src/SoftwareTimer.cc index 5e4214e9..f83df762 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 NeOS; +using namespace Kernel; SoftwareTimer::SoftwareTimer(Int64 seconds) : fWaitFor(seconds) diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc index 8d987ab5..62ae56ac 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 NeOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Drive output diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc index 9f1a0068..b600d7b5 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 NeOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Drive output diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc index 3e2c2c53..6628959c 100644 --- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc +++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc @@ -6,7 +6,7 @@ #include <StorageKit/NVME.h> -namespace NeOS +namespace Kernel { NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(IDeviceObject*, MountpointInterface* outpacket), void (*in)(IDeviceObject*, MountpointInterface* inpacket), @@ -25,4 +25,4 @@ namespace NeOS { return ("/dev/nvme{}"); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/Swap/DiskSwap.cc b/dev/kernel/src/Swap/DiskSwap.cc index c50a96a9..9ebc0d1f 100644 --- a/dev/kernel/src/Swap/DiskSwap.cc +++ b/dev/kernel/src/Swap/DiskSwap.cc @@ -7,7 +7,7 @@ #include <SwapKit/DiskSwap.h> #include <KernelKit/FileMgr.h> -namespace NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Write memory chunk onto disk. @@ -64,4 +64,4 @@ namespace NeOS return reinterpret_cast<SWAP_DISK_HEADER*>(blob); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/ThreadLocalStorage.cc b/dev/kernel/src/ThreadLocalStorage.cc index b25b4288..e784943d 100644 --- a/dev/kernel/src/ThreadLocalStorage.cc +++ b/dev/kernel/src/ThreadLocalStorage.cc @@ -18,7 +18,7 @@ /// @brief Process Thread Local Storage. /***********************************************************************************/ -using namespace NeOS; +using namespace Kernel; /** * @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(NeOS::VoidPtr tib_ptr) noexcept +EXTERN_C Bool tls_check_syscall_impl(Kernel::VoidPtr tib_ptr) noexcept { if (!tib_ptr) { diff --git a/dev/kernel/src/Timer.cc b/dev/kernel/src/Timer.cc index 5df81134..df0f7518 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 NeOS; +using namespace Kernel; /// @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 fab5da88..a160d97f 100644 --- a/dev/kernel/src/User.cc +++ b/dev/kernel/src/User.cc @@ -22,7 +22,7 @@ /// @file User.cc /// @brief Multi-user support. -namespace NeOS +namespace Kernel { namespace Detail { @@ -192,4 +192,4 @@ namespace NeOS { return this->Ring() == UserRingKind::kRingSuperUser; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc index 98abe13c..99dbc410 100644 --- a/dev/kernel/src/UserProcessScheduler.cc +++ b/dev/kernel/src/UserProcessScheduler.cc @@ -22,7 +22,7 @@ ///! BUGS: 0 -namespace NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Exit Code global variable. @@ -623,4 +623,4 @@ namespace NeOS { return mTeam.AsArray().Count() == 0; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/src/UserProcessTeam.cc b/dev/kernel/src/UserProcessTeam.cc index e0533ef1..a0a39054 100644 --- a/dev/kernel/src/UserProcessTeam.cc +++ b/dev/kernel/src/UserProcessTeam.cc @@ -11,7 +11,7 @@ #include <KernelKit/UserProcessScheduler.h> -namespace NeOS +namespace Kernel { UserProcessTeam::UserProcessTeam() { @@ -54,6 +54,6 @@ namespace NeOS { return this->mCurrentProcess; } -} // namespace NeOS +} // namespace Kernel // last rev 05-03-24 diff --git a/dev/kernel/src/Utils.cc b/dev/kernel/src/Utils.cc index a362099a..07090e91 100644 --- a/dev/kernel/src/Utils.cc +++ b/dev/kernel/src/Utils.cc @@ -6,7 +6,7 @@ #include <NewKit/Utils.h> -namespace NeOS +namespace Kernel { Int32 rt_string_cmp(const Char* src, const Char* cmp, Size size) { @@ -210,15 +210,15 @@ namespace NeOS return str; } -} // namespace NeOS +} // namespace Kernel EXTERN_C void* memset(void* dst, int c, long long unsigned int len) { - return NeOS::rt_set_memory(dst, c, len); + return Kernel::rt_set_memory(dst, c, len); } EXTERN_C void* memcpy(void* dst, const void* src, long long unsigned int len) { - NeOS::rt_copy_memory(const_cast<void*>(src), dst, len); + Kernel::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 7b4b0389..6c2c6fd9 100644 --- a/dev/kernel/src/Variant.cc +++ b/dev/kernel/src/Variant.cc @@ -6,7 +6,7 @@ #include <NewKit/Variant.h> -namespace NeOS +namespace Kernel { const Char* Variant::ToString() { @@ -40,4 +40,4 @@ namespace NeOS { return this->fPtr; } -} // namespace NeOS +} // namespace Kernel |