From ba7b3ed69cd24970a28b72c54982735cd120e663 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 19:57:33 +0100 Subject: 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 --- dev/kernel/src/ACPIFactoryInterface.cc | 4 ++-- dev/kernel/src/BinaryMutex.cc | 4 ++-- dev/kernel/src/BitMapMgr.cc | 4 ++-- dev/kernel/src/CodeMgr.cc | 6 +++--- dev/kernel/src/Crc32.cc | 4 ++-- dev/kernel/src/CxxAbi-AMD64.cc | 6 +++--- dev/kernel/src/CxxAbi-ARM64.cc | 14 +++++++------- dev/kernel/src/DriveMgr+IO.cc | 4 ++-- dev/kernel/src/DriveMgr.cc | 4 ++-- dev/kernel/src/FS/NeFS+FileMgr.cc | 4 ++-- dev/kernel/src/FS/NeFS.cc | 10 +++++----- dev/kernel/src/FileMgr.cc | 4 ++-- dev/kernel/src/HardwareThreadScheduler.cc | 4 ++-- dev/kernel/src/IDylibObject.cc | 2 +- dev/kernel/src/IPEFDylibObject.cc | 2 +- dev/kernel/src/IndexableProperty.cc | 4 ++-- dev/kernel/src/Json.cc | 2 +- dev/kernel/src/KPC.cc | 4 ++-- dev/kernel/src/KString.cc | 4 ++-- dev/kernel/src/LockDelegate.cc | 4 ++-- dev/kernel/src/MemoryMgr.cc | 4 ++-- dev/kernel/src/Network/IPAddr.cc | 4 ++-- dev/kernel/src/Network/IPCAddr.cc | 4 ++-- dev/kernel/src/Network/IPCMsg.cc | 4 ++-- dev/kernel/src/Network/MACAddressGetter.cc | 4 ++-- dev/kernel/src/Network/NetworkDevice.cc | 4 ++-- dev/kernel/src/New+Delete.cc | 10 +++++----- dev/kernel/src/PEFCodeMgr.cc | 8 ++++---- dev/kernel/src/PRDT.cc | 4 ++-- dev/kernel/src/PageMgr.cc | 8 ++++---- dev/kernel/src/Pmm.cc | 4 ++-- dev/kernel/src/SoftwareTimer.cc | 2 +- dev/kernel/src/Storage/AHCIDeviceInterface.cc | 2 +- dev/kernel/src/Storage/ATADeviceInterface.cc | 2 +- dev/kernel/src/Storage/NVMEDeviceInterface.cc | 4 ++-- dev/kernel/src/Swap/DiskSwap.cc | 4 ++-- dev/kernel/src/ThreadLocalStorage.cc | 4 ++-- dev/kernel/src/Timer.cc | 2 +- dev/kernel/src/User.cc | 4 ++-- dev/kernel/src/UserProcessScheduler.cc | 4 ++-- dev/kernel/src/UserProcessTeam.cc | 4 ++-- dev/kernel/src/Utils.cc | 8 ++++---- dev/kernel/src/Variant.cc | 4 ++-- 43 files changed, 98 insertions(+), 98 deletions(-) (limited to 'dev/kernel/src') 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 #include -namespace NeOS +namespace Kernel { /// @brief Finds a descriptor table inside ACPI XSDT. ErrorOr 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 #include -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 #include -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(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(self)); + kout << "object: " << Kernel::number(reinterpret_cast(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(self)); + kout << "object: " << Kernel::number(reinterpret_cast(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 #include -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 -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 /// @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 #include -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 -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 #include -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 #include -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 #include -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 -namespace NeOS +namespace Kernel { Array& 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 #include -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(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 #include -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 #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(ptr)}; } @@ -70,7 +70,7 @@ namespace NeOS /// @return If the page bitmap was cleared or not. Bool PageMgr::Free(Ref& 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 #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 -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 -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 -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 #include -namespace NeOS +namespace Kernel { /***********************************************************************************/ /// @brief Write memory chunk onto disk. @@ -64,4 +64,4 @@ namespace NeOS return reinterpret_cast(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 -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 -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(src), dst, len); + Kernel::rt_copy_memory(const_cast(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 -namespace NeOS +namespace Kernel { const Char* Variant::ToString() { @@ -40,4 +40,4 @@ namespace NeOS { return this->fPtr; } -} // namespace NeOS +} // namespace Kernel -- cgit v1.2.3