diff options
Diffstat (limited to 'dev/Kernel/KernelKit')
32 files changed, 181 insertions, 181 deletions
diff --git a/dev/Kernel/KernelKit/CodeMgr.h b/dev/Kernel/KernelKit/CodeMgr.h index 15ec420e..5f83c74b 100644 --- a/dev/Kernel/KernelKit/CodeMgr.h +++ b/dev/Kernel/KernelKit/CodeMgr.h @@ -18,7 +18,7 @@ #include <KernelKit/PEFCodeMgr.h> #include <KernelKit/IPEFDylibObject.h> -namespace Kernel +namespace NeOS { /// @brief Main process entrypoint. typedef void (*rtl_main_kind)(const SizeT argc, Char** argv, Char** envp, const SizeT envp_len); @@ -34,4 +34,4 @@ namespace Kernel /// @param main the start of the process. /// @return The team's process id. ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/DebugOutput.h b/dev/Kernel/KernelKit/DebugOutput.h index f57575ac..498b2b6b 100644 --- a/dev/Kernel/KernelKit/DebugOutput.h +++ b/dev/Kernel/KernelKit/DebugOutput.h @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace Kernel +namespace NeOS { class TerminalDevice; class DTraceDevice; @@ -200,12 +200,12 @@ namespace Kernel number(number, src); return src; } -} // namespace Kernel +} // namespace NeOS #ifdef kout #undef kout #endif // ifdef kout -#define kout Kernel::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " +#define kout NeOS::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " -#define endl Kernel::TerminalDevice::The() << Kernel::end_line() +#define endl NeOS::TerminalDevice::The() << NeOS::end_line() diff --git a/dev/Kernel/KernelKit/DeviceMgr.h b/dev/Kernel/KernelKit/DeviceMgr.h index 6059f4b8..34ca2957 100644 --- a/dev/Kernel/KernelKit/DeviceMgr.h +++ b/dev/Kernel/KernelKit/DeviceMgr.h @@ -24,11 +24,11 @@ #define kDeviceMgrRootDirPath "/Devices/" -#define NE_DEVICE : public ::Kernel::IDeviceObject +#define NE_DEVICE : public ::NeOS::IDeviceObject // Last Rev: Wed, Apr 3, 2024 9:09:41 AM -namespace Kernel +namespace NeOS { template <typename T> class IDeviceObject; @@ -137,4 +137,4 @@ namespace Kernel kDeviceTypeMediaCtrl, // MM controller kDeviceTypeCount, }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/DriveMgr.h b/dev/Kernel/KernelKit/DriveMgr.h index 997db1f9..f5699dcb 100644 --- a/dev/Kernel/KernelKit/DriveMgr.h +++ b/dev/Kernel/KernelKit/DriveMgr.h @@ -23,7 +23,7 @@ #define drv_sector_cnt(SIZE, SECTOR_SZ) (((SIZE) + (SECTOR_SZ)) / (SECTOR_SZ)) -namespace Kernel +namespace NeOS { enum { @@ -186,6 +186,6 @@ namespace Kernel /// @param DrvIndex drive index. /// @return Int32 fs_ifs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex); -} // namespace Kernel +} // namespace NeOS #endif /* ifndef INC_DRIVE_MANAGER_H */ diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h index 40cf7c46..543a9ae4 100644 --- a/dev/Kernel/KernelKit/FileMgr.h +++ b/dev/Kernel/KernelKit/FileMgr.h @@ -49,7 +49,7 @@ #define kRestrictMax (5U) -#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<NeOS::NodePtr>(PTR) /** @note Refer to first enum. @@ -60,7 +60,7 @@ /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -namespace Kernel +namespace NeOS { enum { @@ -387,6 +387,6 @@ namespace Kernel { mm_delete_heap(fFile); } -} // namespace Kernel +} // namespace NeOS #endif // ifndef INC_FILEMGR_H diff --git a/dev/Kernel/KernelKit/HardwareThreadScheduler.h b/dev/Kernel/KernelKit/HardwareThreadScheduler.h index 3615d570..e620d3a4 100644 --- a/dev/Kernel/KernelKit/HardwareThreadScheduler.h +++ b/dev/Kernel/KernelKit/HardwareThreadScheduler.h @@ -16,7 +16,7 @@ #define kMaxAPInsideSched (8U) -namespace Kernel +namespace NeOS { class HardwareThread; class HardwareThreadScheduler; @@ -144,6 +144,6 @@ namespace Kernel /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void mp_hang_thread(HAL::StackFramePtr stack); -} // namespace Kernel +} // namespace NeOS #endif // !__INC_MP_MANAGER_H__ diff --git a/dev/Kernel/KernelKit/IDylibObject.h b/dev/Kernel/KernelKit/IDylibObject.h index ed1d58a6..2c70e6c7 100644 --- a/dev/Kernel/KernelKit/IDylibObject.h +++ b/dev/Kernel/KernelKit/IDylibObject.h @@ -14,7 +14,7 @@ #define NE_DLL_OBJECT : public IDylibObject -namespace Kernel +namespace NeOS { /// @brief DLL class object. A handle to a shared library. class IDylibObject @@ -45,4 +45,4 @@ namespace Kernel /// @brief Pure implementation, missing method/function handler. EXTERN_C void __zka_pure_call(void); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/IPEFDylibObject.h b/dev/Kernel/KernelKit/IPEFDylibObject.h index 0f241b80..8be424c0 100644 --- a/dev/Kernel/KernelKit/IPEFDylibObject.h +++ b/dev/Kernel/KernelKit/IPEFDylibObject.h @@ -16,7 +16,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/IDylibObject.h> -namespace Kernel +namespace NeOS { /** * @brief Shared Library class @@ -101,6 +101,6 @@ namespace Kernel EXTERN_C IDylibRef rtl_init_dylib(UserProcess& header); EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); -} // namespace Kernel +} // namespace NeOS #endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */ diff --git a/dev/Kernel/KernelKit/LPC.h b/dev/Kernel/KernelKit/LPC.h index a962bc05..d76eeff1 100644 --- a/dev/Kernel/KernelKit/LPC.h +++ b/dev/Kernel/KernelKit/LPC.h @@ -11,15 +11,15 @@ /// @file LPC.h /// @brief Local Process Codes. -#define err_local_ok() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == Kernel::kErrorSuccess) -#define err_local_fail() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != Kernel::kErrorSuccess) -#define err_local_get() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) +#define err_local_ok() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == NeOS::kErrorSuccess) +#define err_local_fail() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != NeOS::kErrorSuccess) +#define err_local_get() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) -#define err_global_ok() (Kernel::kErrorLocalNumber == Kernel::kErrorSuccess) -#define err_global_fail() (Kernel::kErrorLocalNumber != Kernel::kErrorSuccess) -#define err_global_get() (Kernel::kErrorLocalNumber) +#define err_global_ok() (NeOS::kErrorLocalNumber == NeOS::kErrorSuccess) +#define err_global_fail() (NeOS::kErrorLocalNumber != NeOS::kErrorSuccess) +#define err_global_get() (NeOS::kErrorLocalNumber) -namespace Kernel +namespace NeOS { typedef Int32 HError; @@ -67,4 +67,4 @@ namespace Kernel /// @param void no params are needed. /// @return if error-free: false, otherwise true. Boolean err_bug_check(Void) noexcept; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h index c2cbb93c..fb17176e 100644 --- a/dev/Kernel/KernelKit/LoaderInterface.h +++ b/dev/Kernel/KernelKit/LoaderInterface.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/ErrorOr.h> -namespace Kernel +namespace NeOS { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss @@ -31,4 +31,4 @@ namespace Kernel virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const Char* name, _Input Int32 kind) = 0; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/LockDelegate.h b/dev/Kernel/KernelKit/LockDelegate.h index 89daea60..a657caa0 100644 --- a/dev/Kernel/KernelKit/LockDelegate.h +++ b/dev/Kernel/KernelKit/LockDelegate.h @@ -9,7 +9,7 @@ #include <NewKit/Atom.h> #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { enum { @@ -66,4 +66,4 @@ namespace Kernel private: Atom<UInt> fLockStatus; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/MSDOS.h b/dev/Kernel/KernelKit/MSDOS.h index d0d2533b..1a3df13b 100644 --- a/dev/Kernel/KernelKit/MSDOS.h +++ b/dev/Kernel/KernelKit/MSDOS.h @@ -23,30 +23,30 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef Kernel::UInt32 DosWord; -typedef Kernel::Long DosLong; +typedef NeOS::UInt32 DosWord; +typedef NeOS::Long DosLong; typedef struct _DosHeader { - Kernel::UInt8 eMagic[2]; - DosWord eMagLen; - DosWord ePagesCount; - DosWord eCrlc; - DosWord eCParHdr; - DosWord eMinAlloc; - DosWord eMaxAlloc; - DosWord eStackSeg; - DosWord eStackPtr; - DosWord eChksum; - DosWord eIp; - DosWord eCs; - DosWord eLfarlc; - DosWord eOvno; - DosWord eRes[4]; - DosWord eOemid; - DosWord eOeminfo; - DosWord eRes2[10]; - DosLong eLfanew; + NeOS::UInt8 eMagic[2]; + DosWord eMagLen; + DosWord ePagesCount; + DosWord eCrlc; + DosWord eCParHdr; + DosWord eMinAlloc; + DosWord eMaxAlloc; + DosWord eStackSeg; + DosWord eStackPtr; + DosWord eChksum; + DosWord eIp; + DosWord eCs; + DosWord eLfarlc; + DosWord eOvno; + DosWord eRes[4]; + DosWord eOemid; + DosWord eOeminfo; + DosWord eRes2[10]; + DosLong eLfanew; } DosHeader, *DosHeaderPtr; #endif /* ifndef __MSDOS_EXEC__ */ diff --git a/dev/Kernel/KernelKit/MemoryMgr.h b/dev/Kernel/KernelKit/MemoryMgr.h index 81cfe63b..ac12587f 100644 --- a/dev/Kernel/KernelKit/MemoryMgr.h +++ b/dev/Kernel/KernelKit/MemoryMgr.h @@ -15,7 +15,7 @@ #include <KernelKit/LPC.h> #include <Hints/CompilerHint.h> -namespace Kernel +namespace NeOS { /// @brief Declare pointer as free. /// @param heap_ptr the pointer. @@ -66,7 +66,7 @@ namespace Kernel { if (*cls) { - err_global_get() = Kernel::kErrorInvalidData; + err_global_get() = NeOS::kErrorInvalidData; return NO; } @@ -82,6 +82,6 @@ namespace Kernel delete *cls; *cls = nullptr; } -} // namespace Kernel +} // namespace NeOS #endif // !INC_KERNEL_HEAP_H diff --git a/dev/Kernel/KernelKit/PCI/DMA.h b/dev/Kernel/KernelKit/PCI/DMA.h index ab740d01..d5a59577 100644 --- a/dev/Kernel/KernelKit/PCI/DMA.h +++ b/dev/Kernel/KernelKit/PCI/DMA.h @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { enum class DmaKind { @@ -76,6 +76,6 @@ namespace Kernel public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace Kernel +} // namespace NeOS #include <KernelKit/PCI/DMA.inl> diff --git a/dev/Kernel/KernelKit/PCI/DMA.inl b/dev/Kernel/KernelKit/PCI/DMA.inl index efa789bf..0ea2c343 100644 --- a/dev/Kernel/KernelKit/PCI/DMA.inl +++ b/dev/Kernel/KernelKit/PCI/DMA.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { template <class T> T* DMAWrapper::operator->() @@ -17,4 +17,4 @@ namespace Kernel { return reinterpret_cast<T*>((UIntPtr)fAddress + offset); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/Database.h b/dev/Kernel/KernelKit/PCI/Database.h index 8bd67078..82f38d33 100644 --- a/dev/Kernel/KernelKit/PCI/Database.h +++ b/dev/Kernel/KernelKit/PCI/Database.h @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.h> #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { namespace Types { @@ -35,4 +35,4 @@ namespace Kernel Invalid = Unassgined, }; } // namespace Types -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/Device.h b/dev/Kernel/KernelKit/PCI/Device.h index cb463485..9870f618 100644 --- a/dev/Kernel/KernelKit/PCI/Device.h +++ b/dev/Kernel/KernelKit/PCI/Device.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace Kernel::PCI +namespace NeOS::PCI { enum class PciConfigKind : UShort { @@ -75,7 +75,7 @@ namespace Kernel::PCI UShort fFunction; UInt32 fBar; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI -EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); -EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(NeOS::UInt bar); +EXTERN_C NeOS::UInt NewOSPCIReadRaw(NeOS::UInt bar); diff --git a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl index da9ba1e4..0bac35bc 100644 --- a/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/dev/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { template <SizeT Sz> template <typename T> @@ -51,4 +51,4 @@ namespace Kernel break; } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/PCI/IO.h b/dev/Kernel/KernelKit/PCI/IO.h index 4e405020..b6d491ce 100644 --- a/dev/Kernel/KernelKit/PCI/IO.h +++ b/dev/Kernel/KernelKit/PCI/IO.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace Kernel +namespace NeOS { template <SizeT Sz> class IOArray final @@ -50,7 +50,7 @@ namespace Kernel }; using IOArray16 = IOArray<16>; -} // namespace Kernel +} // namespace NeOS #ifdef __x86_64__ #include <KernelKit/PCI/IO-Impl-AMD64.inl> diff --git a/dev/Kernel/KernelKit/PCI/Iterator.h b/dev/Kernel/KernelKit/PCI/Iterator.h index c364e1f7..2a788450 100644 --- a/dev/Kernel/KernelKit/PCI/Iterator.h +++ b/dev/Kernel/KernelKit/PCI/Iterator.h @@ -17,7 +17,7 @@ #define NE_DEVICE_COUNT (33) #define NE_FUNCTION_COUNT (8) -namespace Kernel::PCI +namespace NeOS::PCI { class Iterator final { @@ -38,6 +38,6 @@ namespace Kernel::PCI private: Array<PCI::Device, NE_BUS_COUNT> fDevices; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI #endif // __PCI_ITERATOR_H__ diff --git a/dev/Kernel/KernelKit/PCI/PCI.h b/dev/Kernel/KernelKit/PCI/PCI.h index 8fe751f2..4bc4aa82 100644 --- a/dev/Kernel/KernelKit/PCI/PCI.h +++ b/dev/Kernel/KernelKit/PCI/PCI.h @@ -15,7 +15,7 @@ #define kPCIFuncCount (8) #define kPCIBusCount (255) -namespace Kernel::PCI +namespace NeOS::PCI { // model struct DeviceHeader @@ -56,4 +56,4 @@ namespace Kernel::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/KernelKit/PE.h b/dev/Kernel/KernelKit/PE.h index 0f5c7755..a4ae5c4a 100644 --- a/dev/Kernel/KernelKit/PE.h +++ b/dev/Kernel/KernelKit/PE.h @@ -29,62 +29,62 @@ typedef struct LDR_EXEC_HEADER final { - Kernel::UInt32 mSignature; - Kernel::UInt16 mMachine; - Kernel::UInt16 mNumberOfSections; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt32 mPointerToSymbolTable; - Kernel::UInt32 mNumberOfSymbols; - Kernel::UInt16 mSizeOfOptionalHeader; - Kernel::UInt16 mCharacteristics; + NeOS::UInt32 mSignature; + NeOS::UInt16 mMachine; + NeOS::UInt16 mNumberOfSections; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt32 mPointerToSymbolTable; + NeOS::UInt32 mNumberOfSymbols; + NeOS::UInt16 mSizeOfOptionalHeader; + NeOS::UInt16 mCharacteristics; } LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR; typedef struct LDR_OPTIONAL_HEADER final { - Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - Kernel::UInt8 mMajorLinkerVersion; - Kernel::UInt8 mMinorLinkerVersion; - Kernel::UInt32 mSizeOfCode; - Kernel::UInt32 mSizeOfInitializedData; - Kernel::UInt32 mSizeOfUninitializedData; - Kernel::UInt32 mAddressOfEntryPoint; - Kernel::UInt32 mBaseOfCode; - Kernel::UInt32 mBaseOfData; - Kernel::UInt32 mImageBase; - Kernel::UInt32 mSectionAlignment; - Kernel::UInt32 mFileAlignment; - Kernel::UInt16 mMajorOperatingSystemVersion; - Kernel::UInt16 mMinorOperatingSystemVersion; - Kernel::UInt16 mMajorImageVersion; - Kernel::UInt16 mMinorImageVersion; - Kernel::UInt16 mMajorSubsystemVersion; - Kernel::UInt16 mMinorSubsystemVersion; - Kernel::UInt32 mWin32VersionValue; - Kernel::UInt32 mSizeOfImage; - Kernel::UInt32 mSizeOfHeaders; - Kernel::UInt32 mCheckSum; - Kernel::UInt16 mSubsystem; - Kernel::UInt16 mDllCharacteristics; - Kernel::UInt32 mSizeOfStackReserve; - Kernel::UInt32 mSizeOfStackCommit; - Kernel::UInt32 mSizeOfHeapReserve; - Kernel::UInt32 mSizeOfHeapCommit; - Kernel::UInt32 mLoaderFlags; - Kernel::UInt32 mNumberOfRvaAndSizes; + NeOS::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + NeOS::UInt8 mMajorLinkerVersion; + NeOS::UInt8 mMinorLinkerVersion; + NeOS::UInt32 mSizeOfCode; + NeOS::UInt32 mSizeOfInitializedData; + NeOS::UInt32 mSizeOfUninitializedData; + NeOS::UInt32 mAddressOfEntryPoint; + NeOS::UInt32 mBaseOfCode; + NeOS::UInt32 mBaseOfData; + NeOS::UInt32 mImageBase; + NeOS::UInt32 mSectionAlignment; + NeOS::UInt32 mFileAlignment; + NeOS::UInt16 mMajorOperatingSystemVersion; + NeOS::UInt16 mMinorOperatingSystemVersion; + NeOS::UInt16 mMajorImageVersion; + NeOS::UInt16 mMinorImageVersion; + NeOS::UInt16 mMajorSubsystemVersion; + NeOS::UInt16 mMinorSubsystemVersion; + NeOS::UInt32 mWin32VersionValue; + NeOS::UInt32 mSizeOfImage; + NeOS::UInt32 mSizeOfHeaders; + NeOS::UInt32 mCheckSum; + NeOS::UInt16 mSubsystem; + NeOS::UInt16 mDllCharacteristics; + NeOS::UInt32 mSizeOfStackReserve; + NeOS::UInt32 mSizeOfStackCommit; + NeOS::UInt32 mSizeOfHeapReserve; + NeOS::UInt32 mSizeOfHeapCommit; + NeOS::UInt32 mLoaderFlags; + NeOS::UInt32 mNumberOfRvaAndSizes; } LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR; typedef struct LDR_SECTION_HEADER final { - Kernel::Char mName[8]; - Kernel::UInt32 mVirtualSize; - Kernel::UInt32 mVirtualAddress; - Kernel::UInt32 mSizeOfRawData; - Kernel::UInt32 mPointerToRawData; - Kernel::UInt32 mPointerToRelocations; - Kernel::UInt32 mPointerToLineNumbers; - Kernel::UInt16 mNumberOfRelocations; - Kernel::UInt16 mNumberOfLinenumbers; - Kernel::UInt32 mCharacteristics; + NeOS::Char mName[8]; + NeOS::UInt32 mVirtualSize; + NeOS::UInt32 mVirtualAddress; + NeOS::UInt32 mSizeOfRawData; + NeOS::UInt32 mPointerToRawData; + NeOS::UInt32 mPointerToRelocations; + NeOS::UInt32 mPointerToLineNumbers; + NeOS::UInt16 mNumberOfRelocations; + NeOS::UInt16 mNumberOfLinenumbers; + NeOS::UInt32 mCharacteristics; } LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR; enum kExecDataDirParams @@ -97,35 +97,35 @@ enum kExecDataDirParams typedef struct LDR_EXPORT_DIRECTORY { - Kernel::UInt32 mCharacteristics; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt16 mMajorVersion; - Kernel::UInt16 mMinorVersion; - Kernel::UInt32 mName; - Kernel::UInt32 mBase; - Kernel::UInt32 mNumberOfFunctions; - Kernel::UInt32 mNumberOfNames; - Kernel::UInt32 mAddressOfFunctions; // export table rva - Kernel::UInt32 mAddressOfNames; - Kernel::UInt32 mAddressOfNameOrdinal; // ordinal table rva + NeOS::UInt32 mCharacteristics; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt16 mMajorVersion; + NeOS::UInt16 mMinorVersion; + NeOS::UInt32 mName; + NeOS::UInt32 mBase; + NeOS::UInt32 mNumberOfFunctions; + NeOS::UInt32 mNumberOfNames; + NeOS::UInt32 mAddressOfFunctions; // export table rva + NeOS::UInt32 mAddressOfNames; + NeOS::UInt32 mAddressOfNameOrdinal; // ordinal table rva } LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR; typedef struct LDR_IMPORT_DIRECTORY { union { - Kernel::UInt32 mCharacteristics; - Kernel::UInt32 mOriginalFirstThunk; + NeOS::UInt32 mCharacteristics; + NeOS::UInt32 mOriginalFirstThunk; }; - Kernel::UInt32 mTimeDateStamp; - Kernel::UInt32 mForwarderChain; - Kernel::UInt32 mNameRva; - Kernel::UInt32 mThunkTableRva; + NeOS::UInt32 mTimeDateStamp; + NeOS::UInt32 mForwarderChain; + NeOS::UInt32 mNameRva; + NeOS::UInt32 mThunkTableRva; } LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR; typedef struct LDR_DATA_DIRECTORY { - Kernel::UInt32 VirtualAddress; - Kernel::UInt32 Size; + NeOS::UInt32 VirtualAddress; + NeOS::UInt32 Size; } LDR_DATA_DIRECTORY, *LDR_DATA_DIRECTORY_PTR; typedef struct LDR_IMAGE_HEADER diff --git a/dev/Kernel/KernelKit/PEF.h b/dev/Kernel/KernelKit/PEF.h index a49c4fc6..48e5c243 100644 --- a/dev/Kernel/KernelKit/PEF.h +++ b/dev/Kernel/KernelKit/PEF.h @@ -44,7 +44,7 @@ #define kPefForkKind kPefMagic #define kPefForkKindFAT kPefMagicFat -namespace Kernel +namespace NeOS { enum { @@ -112,6 +112,6 @@ namespace Kernel kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace Kernel +} // namespace NeOS #endif /* ifndef KERNELKIT_PEF_H */ diff --git a/dev/Kernel/KernelKit/PEFCodeMgr.h b/dev/Kernel/KernelKit/PEFCodeMgr.h index aa82f84d..47aea432 100644 --- a/dev/Kernel/KernelKit/PEFCodeMgr.h +++ b/dev/Kernel/KernelKit/PEFCodeMgr.h @@ -18,7 +18,7 @@ #define kPefApplicationMime "application/vnd-zka-executable" -namespace Kernel +namespace NeOS { /// /// \name PEFLoader @@ -67,6 +67,6 @@ namespace Kernel { ProcessID rtl_create_process(PEFLoader& exec, const Int32& procKind) noexcept; } // namespace Utils -} // namespace Kernel +} // namespace NeOS #endif // ifndef _INC_CODE_MANAGER_PEF_H_ diff --git a/dev/Kernel/KernelKit/Semaphore.h b/dev/Kernel/KernelKit/Semaphore.h index 7738b53a..5d77b84d 100644 --- a/dev/Kernel/KernelKit/Semaphore.h +++ b/dev/Kernel/KernelKit/Semaphore.h @@ -10,7 +10,7 @@ #include <KernelKit/Timer.h> #include <CompilerKit/CompilerKit.h> -namespace Kernel +namespace NeOS { class UserProcess; @@ -40,4 +40,4 @@ namespace Kernel private: UserProcessRef fLockingProcess; }; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.h b/dev/Kernel/KernelKit/ThreadLocalStorage.h index 5f80d7c7..573b40b8 100644 --- a/dev/Kernel/KernelKit/ThreadLocalStorage.h +++ b/dev/Kernel/KernelKit/ThreadLocalStorage.h @@ -28,12 +28,12 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr Record{nullptr}; //! Thread information record. + NeOS::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + NeOS::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. -Kernel::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); +NeOS::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); ///! @brief new ptr syscall. template <typename T> @@ -41,26 +41,26 @@ T* tls_new_ptr(void) noexcept; ///! @brief delete ptr syscall. template <typename T> -Kernel::Boolean tls_delete_ptr(T* ptr) noexcept; +NeOS::Boolean tls_delete_ptr(T* ptr) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept; +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept; +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept; template <typename T, typename... Args> T* tls_new_class(Args&&... args); /// @brief TLS install TIB and PIB. (syscall) -EXTERN_C Kernel::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); +EXTERN_C NeOS::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); /// @brief TLS check (syscall) -EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; +EXTERN_C NeOS::Bool tls_check_syscall_impl(NeOS::VoidPtr TIB) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/dev/Kernel/KernelKit/ThreadLocalStorage.inl b/dev/Kernel/KernelKit/ThreadLocalStorage.inl index 0517dada..d912f5aa 100644 --- a/dev/Kernel/KernelKit/ThreadLocalStorage.inl +++ b/dev/Kernel/KernelKit/ThreadLocalStorage.inl @@ -14,7 +14,7 @@ template <typename T> inline T* tls_new_ptr(void) noexcept { - using namespace Kernel; + using namespace NeOS; auto ref_process = UserProcessScheduler::The().CurrentProcess(); MUST_PASS(ref_process); @@ -30,9 +30,9 @@ inline T* tls_new_ptr(void) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(T* obj) noexcept +inline NeOS::Bool tls_delete_ptr(T* obj) noexcept { - using namespace Kernel; + using namespace NeOS; if (!obj) return No; @@ -48,7 +48,7 @@ inline Kernel::Bool tls_delete_ptr(T* obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept { return tls_delete_ptr(obj.Leak()); } @@ -56,7 +56,7 @@ inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept +inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept { return tls_delete_ptr(obj->Leak()); } @@ -69,7 +69,7 @@ inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept template <typename T, typename... Args> T* tls_new_class(Args&&... args) { - using namespace Kernel; + using namespace NeOS; T* obj = tls_new_ptr<T>(); @@ -87,9 +87,9 @@ T* tls_new_class(Args&&... args) /// @param obj /// @return template <typename T> -inline Kernel::Bool tls_delete_class(T* obj) +inline NeOS::Bool tls_delete_class(T* obj) { - using namespace Kernel; + using namespace NeOS; if (!obj) return No; diff --git a/dev/Kernel/KernelKit/Timer.h b/dev/Kernel/KernelKit/Timer.h index e22b71a2..6328c1a1 100644 --- a/dev/Kernel/KernelKit/Timer.h +++ b/dev/Kernel/KernelKit/Timer.h @@ -9,7 +9,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/LPC.h> -namespace Kernel +namespace NeOS { class SoftwareTimer; class TimerInterface; @@ -78,4 +78,4 @@ namespace Kernel return 1000 * Milliseconds(time); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h index dcdb0f18..41cf57e2 100644 --- a/dev/Kernel/KernelKit/User.h +++ b/dev/Kernel/KernelKit/User.h @@ -23,7 +23,7 @@ #define kMaxUserNameLen (255U) #define kMaxUserTokenLen (255U) -namespace Kernel +namespace NeOS { class User; @@ -81,6 +81,6 @@ namespace Kernel Char mUserName[kMaxUserNameLen] = {0}; Char mUserKey[kMaxUserTokenLen] = {0}; }; -} // namespace Kernel +} // namespace NeOS #endif /* ifndef INC_USER_H */ diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.h b/dev/Kernel/KernelKit/UserProcessScheduler.h index 6c96c8e5..17d992b4 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.h +++ b/dev/Kernel/KernelKit/UserProcessScheduler.h @@ -26,7 +26,7 @@ // The current date is: Thu 11/28/2024 // //////////////////////////////////////////////////// -namespace Kernel +namespace NeOS { //! @note Forward class declarations. @@ -329,7 +329,7 @@ namespace Kernel }; const UInt32& sched_get_exit_code(void) noexcept; -} // namespace Kernel +} // namespace NeOS #include <KernelKit/ThreadLocalStorage.h> #include <KernelKit/UserProcessScheduler.inl> diff --git a/dev/Kernel/KernelKit/UserProcessScheduler.inl b/dev/Kernel/KernelKit/UserProcessScheduler.inl index a0c1d335..6dd8c434 100644 --- a/dev/Kernel/KernelKit/UserProcessScheduler.inl +++ b/dev/Kernel/KernelKit/UserProcessScheduler.inl @@ -7,7 +7,7 @@ ------------------------------------------- */ -namespace Kernel +namespace NeOS { /***********************************************************************************/ /** @brief Free pointer from usage. */ @@ -48,4 +48,4 @@ namespace Kernel return No; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/KernelKit/XCOFF.h b/dev/Kernel/KernelKit/XCOFF.h index 1c577a7b..57cb0c73 100644 --- a/dev/Kernel/KernelKit/XCOFF.h +++ b/dev/Kernel/KernelKit/XCOFF.h @@ -29,13 +29,13 @@ struct XCoffForkHeader; /// @brief XCoff file header, meant for POWER apps. typedef struct XCoffFileHeader { - Kernel::UInt16 fMagic; - Kernel::UInt16 fTarget; - Kernel::UInt16 fNumSecs; - Kernel::UInt32 fTimeDat; - Kernel::UIntPtr fSymPtr; - Kernel::UInt32 fNumSyms; - Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header + NeOS::UInt16 fMagic; + NeOS::UInt16 fTarget; + NeOS::UInt16 fNumSecs; + NeOS::UInt32 fTimeDat; + NeOS::UIntPtr fSymPtr; + NeOS::UInt32 fNumSyms; + NeOS::UInt16 fOptHdr; // ?: Number of bytes in optional header } XCoffFileHeader64; #define cForkNameLen (255) @@ -43,9 +43,9 @@ typedef struct XCoffFileHeader /// @brief This the executable manifest fork. typedef struct XCoffForkHeader { - Kernel::Char fPropertiesXMLFork[cForkNameLen]; - Kernel::Char fDynamicLoaderFork[cForkNameLen]; - Kernel::Char fCodeSignFork[cForkNameLen]; + NeOS::Char fPropertiesXMLFork[cForkNameLen]; + NeOS::Char fDynamicLoaderFork[cForkNameLen]; + NeOS::Char fCodeSignFork[cForkNameLen]; } XCoffForkHeader; #endif // ifndef INC_XOCFF_H |