diff options
| author | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-07-02 22:00:35 +0200 |
|---|---|---|
| committer | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-07-02 22:00:49 +0200 |
| commit | 375d0210dcb2070a12d916523f4a1dafff28360c (patch) | |
| tree | d0c217f529b8069ea659778c2ee9ca20aeba33a4 /Kernel/Sources | |
| parent | f1d3744829a661d1600c2f3bbdbdf679ee0bd0e1 (diff) | |
MHR-36: Change namespace name, got out of the codename stage.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
Diffstat (limited to 'Kernel/Sources')
46 files changed, 168 insertions, 168 deletions
diff --git a/Kernel/Sources/CodeManager.cxx b/Kernel/Sources/CodeManager.cxx index 9f374c18..91b6c99e 100644 --- a/Kernel/Sources/CodeManager.cxx +++ b/Kernel/Sources/CodeManager.cxx @@ -8,7 +8,7 @@ #include <KernelKit/CodeManager.hpp> #include <KernelKit/ProcessScheduler.hxx> -namespace NewOS +namespace Kernel { /// @brief Executes a new process from a function. kernel code only. /// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible. @@ -27,4 +27,4 @@ namespace NewOS return ProcessScheduler::The().Leak().Add(refProc); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Crc32.cxx b/Kernel/Sources/Crc32.cxx index f46ceaa8..8c555dc5 100644 --- a/Kernel/Sources/Crc32.cxx +++ b/Kernel/Sources/Crc32.cxx @@ -9,7 +9,7 @@ // @file CRC32.cpp // @brief Check sequence implementation. -namespace NewOS +namespace Kernel { /// @brief The CRC32 table. UInt kCrcTbl[kCrcCnt] = { @@ -71,4 +71,4 @@ namespace NewOS // return (~crc); also works, does the same thing. return (crc ^ 0xffffffff); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/CxxAbi.cxx b/Kernel/Sources/CxxAbi.cxx index efc908d7..febffbc4 100644 --- a/Kernel/Sources/CxxAbi.cxx +++ b/Kernel/Sources/CxxAbi.cxx @@ -13,17 +13,17 @@ atexit_func_entry_t __atexit_funcs[kDSOMaxObjects]; uarch_t __atexit_func_count; /// @brief Dynamic Shared Object Handle. -NewOS::UIntPtr __dso_handle; +Kernel::UIntPtr __dso_handle; EXTERN_C void __cxa_pure_virtual() { - NewOS::kcout << "newoskrnl: C++ placeholder method.\n"; + Kernel::kcout << "newoskrnl: C++ placeholder method.\n"; } EXTERN_C void ___chkstk_ms() { - NewOS::err_bug_check_raise(); - NewOS::err_bug_check(); + Kernel::err_bug_check_raise(); + Kernel::err_bug_check(); } #ifdef __NEWOS_ARM64__ diff --git a/Kernel/Sources/DriveManager.cxx b/Kernel/Sources/DriveManager.cxx index fa4b8298..039a4e00 100644 --- a/Kernel/Sources/DriveManager.cxx +++ b/Kernel/Sources/DriveManager.cxx @@ -13,7 +13,7 @@ /// @file DriveManager.cxx /// @brief Kernel drive manager. -namespace NewOS +namespace Kernel { static UInt16 kATAIO = 0U; static UInt8 kATAMaster = 0U; @@ -146,4 +146,4 @@ namespace NewOS return trait; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx index 20451f96..1eef02d8 100644 --- a/Kernel/Sources/FS/NewFS.cxx +++ b/Kernel/Sources/FS/NewFS.cxx @@ -18,7 +18,7 @@ #include <FirmwareKit/EPM.hxx> #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; ///! BUGS: 0 @@ -943,7 +943,7 @@ SizeT NewFSParser::Tell(_Input _Output NewCatalog* catalog) return 0; } -namespace NewOS::Detail +namespace Kernel::Detail { /***********************************************************************************/ /// @brief Construct NewFS drives. @@ -978,6 +978,6 @@ namespace NewOS::Detail return true; } -} // namespace NewOS::Detail +} // namespace Kernel::Detail #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx index 11830252..35913b85 100644 --- a/Kernel/Sources/FileManager.cxx +++ b/Kernel/Sources/FileManager.cxx @@ -8,9 +8,9 @@ #include <NewKit/Utils.hpp> /// BUGS: 0 -//! @brief File manager for NewOS. +//! @brief File manager for Kernel. -namespace NewOS +namespace Kernel { static FilesystemManagerInterface* kMounted = nullptr; @@ -189,4 +189,4 @@ namespace NewOS return fImpl; } #endif // __FSKIT_NEWFS__ -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Framebuffer.cxx b/Kernel/Sources/Framebuffer.cxx index d6a4e124..205291bb 100644 --- a/Kernel/Sources/Framebuffer.cxx +++ b/Kernel/Sources/Framebuffer.cxx @@ -19,16 +19,16 @@ * */ -using namespace NewOS; +using namespace Kernel; -namespace NewOS +namespace Kernel { const UInt32 kRgbRed = 0x000000FF; const UInt32 kRgbGreen = 0x0000FF00; const UInt32 kRgbBlue = 0x00FF0000; const UInt32 kRgbBlack = 0x00000000; const UInt32 kRgbWhite = 0xFFFFFFFF; -} // namespace NewOS +} // namespace Kernel /** * @brief Get Pixel at @@ -73,11 +73,11 @@ Ref<FramebufferContext*>& Framebuffer::Leak() Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, UInt32 color) { - for (NewOS::SizeT i = x; i < width + x; ++i) + for (Kernel::SizeT i = x; i < width + x; ++i) { - for (NewOS::SizeT u = y; u < height + y; ++u) + for (Kernel::SizeT u = y; u < height + y; ++u) { - *(((volatile NewOS::UInt32*)(fFrameBufferAddr.Leak()->fBase + + *(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase + 4 * fFrameBufferAddr.Leak()->fBpp * i + 4 * u))) = color; } @@ -88,7 +88,7 @@ Framebuffer& Framebuffer::DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, Framebuffer& Framebuffer::PutPixel(SizeT x, SizeT y, UInt32 color) { - *(((volatile NewOS::UInt32*)(fFrameBufferAddr.Leak()->fBase + + *(((volatile Kernel::UInt32*)(fFrameBufferAddr.Leak()->fBase + 4 * fFrameBufferAddr.Leak()->fBpp * x + 4 * y))) = color; diff --git a/Kernel/Sources/GUIDWizard.cxx b/Kernel/Sources/GUIDWizard.cxx index 9347f022..0af8e289 100644 --- a/Kernel/Sources/GUIDWizard.cxx +++ b/Kernel/Sources/GUIDWizard.cxx @@ -17,7 +17,7 @@ // @brief Size of UUID. #define kUUIDSize 37 -namespace NewOS::XRN::Version1 +namespace Kernel::XRN::Version1 { auto make_sequence(const ArrayList<UShort>& uuidSeq) -> Ref<GUIDSequence*> { @@ -62,4 +62,4 @@ namespace NewOS::XRN::Version1 return ErrorOr<Ref<StringView>>{-1}; } -} // namespace NewOS::XRN::Version1 +} // namespace Kernel::XRN::Version1 diff --git a/Kernel/Sources/GUIDWrapper.cxx b/Kernel/Sources/GUIDWrapper.cxx index e453227b..259c76e2 100644 --- a/Kernel/Sources/GUIDWrapper.cxx +++ b/Kernel/Sources/GUIDWrapper.cxx @@ -6,6 +6,6 @@ #include <CFKit/GUIDWrapper.hpp> -namespace NewOS::XRN +namespace Kernel::XRN { } diff --git a/Kernel/Sources/HError.cxx b/Kernel/Sources/HError.cxx index 39915f65..23d63953 100644 --- a/Kernel/Sources/HError.cxx +++ b/Kernel/Sources/HError.cxx @@ -7,7 +7,7 @@ #include <KernelKit/HError.hpp> #include <NewKit/KernelCheck.hpp> -namespace NewOS +namespace Kernel { STATIC Bool cRaise = false; @@ -29,4 +29,4 @@ namespace NewOS if (!cRaise) cRaise = true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/HalPageAlloc.cxx b/Kernel/Sources/HalPageAlloc.cxx index 3df68501..0339745b 100644 --- a/Kernel/Sources/HalPageAlloc.cxx +++ b/Kernel/Sources/HalPageAlloc.cxx @@ -15,9 +15,9 @@ #include <NewKit/Defines.hpp> #include <NewKit/KernelCheck.hpp> -STATIC NewOS::Boolean kAllocationInProgress = false; +STATIC Kernel::Boolean kAllocationInProgress = false; -namespace NewOS +namespace Kernel { namespace HAL { @@ -106,4 +106,4 @@ namespace NewOS return hal_try_alloc_new_page(rw, user, size); } } // namespace HAL -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/IndexableProperty.cxx b/Kernel/Sources/IndexableProperty.cxx index 7e609037..5cb1d54a 100644 --- a/Kernel/Sources/IndexableProperty.cxx +++ b/Kernel/Sources/IndexableProperty.cxx @@ -16,7 +16,7 @@ #define kMaxLenIndexer 256 -namespace NewOS +namespace Kernel { namespace Indexer { @@ -56,4 +56,4 @@ namespace NewOS } } } // namespace Indexer -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Json.cxx b/Kernel/Sources/Json.cxx index 48e215b8..16a74765 100644 --- a/Kernel/Sources/Json.cxx +++ b/Kernel/Sources/Json.cxx @@ -6,7 +6,7 @@ #include <NewKit/Json.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Undefined object, is null in length. -INIT(NewOS::JsonType::kUndefined, NewOS::JsonType); +INIT(Kernel::JsonType::kUndefined, Kernel::JsonType); diff --git a/Kernel/Sources/KeMain.cxx b/Kernel/Sources/KeMain.cxx index e5ffc4fa..7ec96539 100644 --- a/Kernel/Sources/KeMain.cxx +++ b/Kernel/Sources/KeMain.cxx @@ -24,30 +24,30 @@ #include <NewKit/Utils.hpp> #include <KernelKit/CodeManager.hpp> -namespace NewOS::Detail +namespace Kernel::Detail { /// @brief Filesystem auto installer, additional checks are also done by the class. class FilesystemInstaller final { - NewOS::NewFilesystemManager* fNewFS{nullptr}; + Kernel::NewFilesystemManager* fNewFS{nullptr}; public: /// @brief wizard constructor. explicit FilesystemInstaller() { - if (NewOS::FilesystemManagerInterface::GetMounted()) + if (Kernel::FilesystemManagerInterface::GetMounted()) { /// Mounted partition, cool! - NewOS::kcout + Kernel::kcout << "newoskrnl: No need to create for a NewFS partition here...\r"; } else { /// Not mounted partition, auto-mount. ///! Mounts a NewFS block. - fNewFS = new NewOS::NewFilesystemManager(); + fNewFS = new Kernel::NewFilesystemManager(); - NewOS::FilesystemManagerInterface::Mount(fNewFS); + Kernel::FilesystemManagerInterface::Mount(fNewFS); if (fNewFS->GetParser()) { @@ -57,13 +57,13 @@ namespace NewOS::Detail "C:\\Boot\\", "C:\\System\\", "C:\\Support\\", "C:\\Applications\\", "C:\\Users\\", "C:\\Library\\", "C:\\Mount\\", "C:\\DCIM\\", "C:\\Storage\\"}; - for (NewOS::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx) + for (Kernel::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx) { auto catalogDir = fNewFS->GetParser()->GetCatalog(cDirStr[dirIndx]); if (catalogDir) { - NewOS::kcout << "newoskrnl: Already here\r"; + Kernel::kcout << "newoskrnl: Already here\r"; delete catalogDir; continue; @@ -74,23 +74,23 @@ namespace NewOS::Detail NewFork theFork{0}; - const NewOS::Char* cSrcName = cFolderInfo; + const Kernel::Char* cSrcName = cFolderInfo; - NewOS::rt_copy_memory((NewOS::VoidPtr)(cSrcName), theFork.ForkName, - NewOS::rt_string_len(cSrcName)); + Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theFork.ForkName, + Kernel::rt_string_len(cSrcName)); - NewOS::rt_copy_memory((NewOS::VoidPtr)(catalogDir->Name), + Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDir->Name), theFork.CatalogName, - NewOS::rt_string_len(catalogDir->Name)); + Kernel::rt_string_len(catalogDir->Name)); delete catalogDir; theFork.DataSize = kNewFSForkSize; theFork.ResourceId = 0; - theFork.ResourceKind = NewOS::kNewFSRsrcForkKind; - theFork.Kind = NewOS::kNewFSDataForkKind; + theFork.ResourceKind = Kernel::kNewFSRsrcForkKind; + theFork.Kind = Kernel::kNewFSDataForkKind; - NewOS::StringView metadataFolder(kNewFSSectorSz); + Kernel::StringView metadataFolder(kNewFSSectorSz); metadataFolder += "<p>Kind: folder</p>\r<p>Created by: system</p>\r<p>Edited by: " @@ -100,14 +100,14 @@ namespace NewOS::Detail metadataFolder += cDirStr[dirIndx]; metadataFolder += "</p>\r"; - const NewOS::SizeT metadataSz = kNewFSSectorSz; + const Kernel::SizeT metadataSz = kNewFSSectorSz; auto catalogSystem = fNewFS->GetParser()->GetCatalog(cDirStr[dirIndx]); fNewFS->GetParser()->CreateFork(catalogSystem, theFork); fNewFS->GetParser()->WriteCatalog( - catalogSystem, (NewOS::VoidPtr)(metadataFolder.CData()), + catalogSystem, (Kernel::VoidPtr)(metadataFolder.CData()), metadataSz, cFolderInfo); delete catalogSystem; @@ -117,12 +117,12 @@ namespace NewOS::Detail NewCatalog* catalogDisk = this->fNewFS->GetParser()->GetCatalog("C:\\Mount\\SIM:"); - const NewOS::Char* cSrcName = "DISK-INF"; + const Kernel::Char* cSrcName = "DISK-INF"; if (catalogDisk) { - auto bufferInfoDisk = (NewOS::Char*)this->fNewFS->GetParser()->ReadCatalog(catalogDisk, kNewFSSectorSz, cSrcName); - NewOS::kcout << bufferInfoDisk << NewOS::end_line(); + auto bufferInfoDisk = (Kernel::Char*)this->fNewFS->GetParser()->ReadCatalog(catalogDisk, kNewFSSectorSz, cSrcName); + Kernel::kcout << bufferInfoDisk << Kernel::end_line(); delete bufferInfoDisk; delete catalogDisk; @@ -132,37 +132,37 @@ namespace NewOS::Detail catalogDisk = (NewCatalog*)this->Leak()->CreateAlias("C:\\Mount\\SIM:"); - NewOS::StringView diskFolder(kNewFSSectorSz); + Kernel::StringView diskFolder(kNewFSSectorSz); diskFolder += - "<p>Kind: alias to SIM</p>\r<p>Created by: system</p>\r<p>Edited " + "<p>Kind: alias to SIM Card</p>\r<p>Created by: system</p>\r<p>Edited " "by: " - "system</p>\r<p>Volume Type: SIM</p>\r"; + "system</p>\r<p>Volume Type: SIM Card</p>\r"; diskFolder += "<p>Root: "; - diskFolder += NewOS::NewFilesystemHelper::Root(); + diskFolder += Kernel::NewFilesystemHelper::Root(); diskFolder += "</p>\r"; NewFork theDiskFork{0}; - NewOS::rt_copy_memory((NewOS::VoidPtr)(cSrcName), theDiskFork.ForkName, - NewOS::rt_string_len(cSrcName)); + Kernel::rt_copy_memory((Kernel::VoidPtr)(cSrcName), theDiskFork.ForkName, + Kernel::rt_string_len(cSrcName)); - NewOS::rt_copy_memory((NewOS::VoidPtr)(catalogDisk->Name), + Kernel::rt_copy_memory((Kernel::VoidPtr)(catalogDisk->Name), theDiskFork.CatalogName, - NewOS::rt_string_len(catalogDisk->Name)); + Kernel::rt_string_len(catalogDisk->Name)); theDiskFork.DataSize = kNewFSForkSize; theDiskFork.ResourceId = 0; - theDiskFork.ResourceKind = NewOS::kNewFSRsrcForkKind; - theDiskFork.Kind = NewOS::kNewFSDataForkKind; + theDiskFork.ResourceKind = Kernel::kNewFSRsrcForkKind; + theDiskFork.Kind = Kernel::kNewFSDataForkKind; fNewFS->GetParser()->CreateFork(catalogDisk, theDiskFork); fNewFS->GetParser()->WriteCatalog(catalogDisk, - (NewOS::VoidPtr)diskFolder.CData(), + (Kernel::VoidPtr)diskFolder.CData(), kNewFSSectorSz, cSrcName); - NewOS::kcout << diskFolder.CData() << NewOS::end_line(); + Kernel::kcout << diskFolder.CData() << Kernel::end_line(); delete catalogDisk; } @@ -175,7 +175,7 @@ namespace NewOS::Detail /// @brief Grab the disk's NewFS reference. /// @return NewFilesystemManager the filesystem interface - NewOS::NewFilesystemManager* Leak() + Kernel::NewFilesystemManager* Leak() { return fNewFS; } @@ -184,38 +184,38 @@ namespace NewOS::Detail /// @brief Loads necessary servers for the kernel -> user mode switch. /// @param void no args. /// @return void no return value. - STATIC NewOS::Void ke_launch_srv(NewOS::Void) + STATIC Kernel::Void ke_launch_srv(Kernel::Void) { // load security server. - NewOS::PEFLoader secureSrv("C:\\System\\securesrv.exe"); + Kernel::PEFLoader launchDevil("C:\\System\\launchd"); - if (!secureSrv.IsLoaded()) + if (!launchDevil.IsLoaded()) { - NewOS::ke_stop(RUNTIME_CHECK_FAILED); + Kernel::ke_stop(RUNTIME_CHECK_FAILED); } - NewOS::Utils::execute_from_image(secureSrv, - NewOS::ProcessHeader::kAppKind); + Kernel::Utils::execute_from_image(launchDevil, + Kernel::ProcessHeader::kAppKind); /// load middleware service. - NewOS::PEFLoader middlewareSvc("C:\\System\\middlewaresvc.exe"); + Kernel::PEFLoader stageBoard("C:\\System\\stageboard"); - if (!middlewareSvc.IsLoaded()) + if (!stageBoard.IsLoaded()) { - NewOS::ke_stop(RUNTIME_CHECK_FAILED); + Kernel::ke_stop(RUNTIME_CHECK_FAILED); } - NewOS::Utils::execute_from_image(middlewareSvc, - NewOS::ProcessHeader::kAppKind); + Kernel::Utils::execute_from_image(stageBoard, + Kernel::ProcessHeader::kAppKind); } -} // namespace NewOS::Detail +} // namespace Kernel::Detail /// @brief Application entrypoint. /// @param Void /// @return Void -EXTERN_C NewOS::Void KeMain(NewOS::Void) +EXTERN_C Kernel::Void KeMain(Kernel::Void) { /// Now run kernel loop, until no process are running. - NewOS::Detail::FilesystemInstaller(); // automatic filesystem creation. - NewOS::Detail::ke_launch_srv(); + Kernel::Detail::FilesystemInstaller(); // automatic filesystem creation. + Kernel::Detail::ke_launch_srv(); } diff --git a/Kernel/Sources/KernelCheck.cxx b/Kernel/Sources/KernelCheck.cxx index e0e61ab2..6eb5429c 100644 --- a/Kernel/Sources/KernelCheck.cxx +++ b/Kernel/Sources/KernelCheck.cxx @@ -14,8 +14,8 @@ EXTERN_C [[noreturn]] void ke_wait_for_debugger() while (true) { #ifdef __NEWOS_AMD64__ - NewOS::HAL::rt_cli(); - NewOS::HAL::rt_halt(); + Kernel::HAL::rt_cli(); + Kernel::HAL::rt_halt(); #endif } } @@ -23,9 +23,9 @@ EXTERN_C [[noreturn]] void ke_wait_for_debugger() /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace NewOS +namespace Kernel { - void ke_stop(const NewOS::Int& id) + void ke_stop(const Kernel::Int& id) { kcout << "*** STOP *** \r"; kcout << "*** Kernel has trigerred a runtime stop. *** \r"; @@ -105,7 +105,7 @@ namespace NewOS #endif // __DEBUG__ - NewOS::ke_stop(RUNTIME_CHECK_FAILED); // Runtime Check failed + Kernel::ke_stop(RUNTIME_CHECK_FAILED); // Runtime Check failed } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/KernelHeap.cxx b/Kernel/Sources/KernelHeap.cxx index 770e11da..7bfd9c07 100644 --- a/Kernel/Sources/KernelHeap.cxx +++ b/Kernel/Sources/KernelHeap.cxx @@ -16,7 +16,7 @@ #define kKernelHeapMagic (0xD4D7D5) #define kKernelHeapHeaderPaddingSz (16U) -namespace NewOS +namespace Kernel { STATIC SizeT kHeapCount = 0UL; STATIC PageManager kHeapPageManager; @@ -192,4 +192,4 @@ namespace NewOS return false; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/LockDelegate.cxx b/Kernel/Sources/LockDelegate.cxx index e2134f60..6f0aa1d4 100644 --- a/Kernel/Sources/LockDelegate.cxx +++ b/Kernel/Sources/LockDelegate.cxx @@ -6,7 +6,7 @@ #include <KernelKit/LockDelegate.hpp> -namespace NewOS +namespace Kernel { /// Leave it empty for now. -} // namespace NewOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/Kernel/Sources/Network/IP.cxx b/Kernel/Sources/Network/IP.cxx index 46cdc662..676e12a8 100644 --- a/Kernel/Sources/Network/IP.cxx +++ b/Kernel/Sources/Network/IP.cxx @@ -7,7 +7,7 @@ #include <NetworkKit/IP.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { char* RawIPAddress::Address() { @@ -123,4 +123,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Network/IPCEP.cxx b/Kernel/Sources/Network/IPCEP.cxx index 930969fb..1869035b 100644 --- a/Kernel/Sources/Network/IPCEP.cxx +++ b/Kernel/Sources/Network/IPCEP.cxx @@ -8,7 +8,7 @@ #include <KernelKit/HError.hpp> #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; /// @internal /// @brief The internal sanitize function. @@ -56,7 +56,7 @@ _Fail: return false; } -namespace NewOS +namespace Kernel { /// @brief Sanitize packet function /// @retval true packet is correct. diff --git a/Kernel/Sources/Network/NetworkDevice.cxx b/Kernel/Sources/Network/NetworkDevice.cxx index 24af10eb..4ee633e8 100644 --- a/Kernel/Sources/Network/NetworkDevice.cxx +++ b/Kernel/Sources/Network/NetworkDevice.cxx @@ -7,7 +7,7 @@ #include <NetworkKit/NetworkDevice.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { /// \brief Getter for fNetworkName. const char* NetworkDevice::Name() const @@ -32,4 +32,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/New+Delete.cxx b/Kernel/Sources/New+Delete.cxx index 66912fb8..d87df3e6 100644 --- a/Kernel/Sources/New+Delete.cxx +++ b/Kernel/Sources/New+Delete.cxx @@ -12,7 +12,7 @@ void* operator new[](size_t sz) if (sz == 0) ++sz; - return NewOS::ke_new_ke_heap(sz, true, false); + return Kernel::ke_new_ke_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 NewOS::ke_new_ke_heap(sz, true, false); + return Kernel::ke_new_ke_heap(sz, true, false); } void operator delete[](void* ptr) @@ -28,7 +28,7 @@ void operator delete[](void* ptr) if (ptr == nullptr) return; - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } void operator delete(void* ptr) @@ -36,7 +36,7 @@ void operator delete(void* ptr) if (ptr == nullptr) return; - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } void operator delete(void* ptr, size_t sz) @@ -46,5 +46,5 @@ void operator delete(void* ptr, size_t sz) NEWOS_UNUSED(sz); - NewOS::ke_delete_ke_heap(ptr); + Kernel::ke_delete_ke_heap(ptr); } diff --git a/Kernel/Sources/NewFS+FileManager.cxx b/Kernel/Sources/NewFS+FileManager.cxx index 724175b8..2658d784 100644 --- a/Kernel/Sources/NewFS+FileManager.cxx +++ b/Kernel/Sources/NewFS+FileManager.cxx @@ -12,7 +12,7 @@ /// @brief NewFS File manager. /// BUGS: 0 -namespace NewOS +namespace Kernel { /// @brief C++ constructor NewFilesystemManager::NewFilesystemManager() @@ -84,6 +84,6 @@ namespace NewOS { return kNewFSSeparator; } -} // namespace NewOS +} // namespace Kernel #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/NewFS+IO.cxx b/Kernel/Sources/NewFS+IO.cxx index fc2a3842..884f8c11 100644 --- a/Kernel/Sources/NewFS+IO.cxx +++ b/Kernel/Sources/NewFS+IO.cxx @@ -26,7 +26,7 @@ #define NEWFS_WRITE(DRV, TRAITS, MP) (MP->DRV()).fOutput(&TRAITS) #define NEWFS_READ(DRV, TRAITS, MP) (MP->DRV()).fInput(&TRAITS) -using namespace NewOS; +using namespace Kernel; /// @brief Read from newfs disk. /// @param Mnt mounted interface. diff --git a/Kernel/Sources/NewFS+Journal.cxx b/Kernel/Sources/NewFS+Journal.cxx index 83f2fe66..f69744cc 100644 --- a/Kernel/Sources/NewFS+Journal.cxx +++ b/Kernel/Sources/NewFS+Journal.cxx @@ -13,10 +13,10 @@ ///! @file NewFS+Journal.cxx ///! @brief Journaling for NewFS. -namespace NewOS::Journal +namespace Kernel::Journal { -} // namespace NewOS::Journal +} // namespace Kernel::Journal -using namespace NewOS; +using namespace Kernel; #endif // ifdef __FSKIT_NEWFS__ diff --git a/Kernel/Sources/PEFCodeManager.cxx b/Kernel/Sources/PEFCodeManager.cxx index 09f6e90e..6f06ac37 100644 --- a/Kernel/Sources/PEFCodeManager.cxx +++ b/Kernel/Sources/PEFCodeManager.cxx @@ -13,7 +13,7 @@ #include <NewKit/OwnPtr.hpp> #include <NewKit/String.hpp> -namespace NewOS +namespace Kernel { namespace Detail { @@ -238,4 +238,4 @@ namespace NewOS { return kPefApplicationMime; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PEFSharedObject.cxx b/Kernel/Sources/PEFSharedObject.cxx index 0d5949f1..3e7ec9eb 100644 --- a/Kernel/Sources/PEFSharedObject.cxx +++ b/Kernel/Sources/PEFSharedObject.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -24,7 +24,7 @@ ------------------------------------------- */ -using namespace NewOS; +using namespace Kernel; /***********************************************************************************/ /// @file SharedObjectRT.cxx diff --git a/Kernel/Sources/PRDT.cxx b/Kernel/Sources/PRDT.cxx index 57b57d40..73dadbab 100644 --- a/Kernel/Sources/PRDT.cxx +++ b/Kernel/Sources/PRDT.cxx @@ -8,7 +8,7 @@ #include <NewKit/String.hpp> #include <StorageKit/PRDT.hpp> -namespace NewOS +namespace Kernel { /// @brief constructs a new PRD. /// @param prd PRD reference. @@ -19,4 +19,4 @@ namespace NewOS prd.Leak().fSectorCount = 0x0; prd.Leak().fEndBit = 0x0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PageAllocator.cxx b/Kernel/Sources/PageAllocator.cxx index 11e21c4d..27006885 100644 --- a/Kernel/Sources/PageAllocator.cxx +++ b/Kernel/Sources/PageAllocator.cxx @@ -9,7 +9,7 @@ #include <NewKit/PageAllocator.hpp> /// @brief Internal namespace, used internally by kernel. -namespace NewOS::Detail +namespace Kernel::Detail { VoidPtr create_page_wrapper(Boolean rw, Boolean user, SizeT pageSz) { @@ -49,4 +49,4 @@ namespace NewOS::Detail return false; } -} // namespace NewOS::Detail +} // namespace Kernel::Detail diff --git a/Kernel/Sources/PageManager.cxx b/Kernel/Sources/PageManager.cxx index 413c830f..35693310 100644 --- a/Kernel/Sources/PageManager.cxx +++ b/Kernel/Sources/PageManager.cxx @@ -16,7 +16,7 @@ //! null deref will throw (Page Zero detected, aborting app!) #define kProtectedRegionEnd (512) -namespace NewOS +namespace Kernel { PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) : fRw(Rw), @@ -64,7 +64,7 @@ namespace NewOS PTEWrapper PageManager::Request(Boolean Rw, Boolean User, Boolean ExecDisable, SizeT Sz) { // Store PTE wrapper right after PTE. - VoidPtr ptr = NewOS::HAL::hal_alloc_page(Rw, User, Sz); + VoidPtr ptr = Kernel::HAL::hal_alloc_page(Rw, User, Sz); return PTEWrapper{Rw, User, ExecDisable, reinterpret_cast<UIntPtr>(ptr)}; } @@ -115,4 +115,4 @@ namespace NewOS { return this->fExecDisable; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/PermissionSelector.cxx b/Kernel/Sources/PermissionSelector.cxx index 939a9648..e5cfd409 100644 --- a/Kernel/Sources/PermissionSelector.cxx +++ b/Kernel/Sources/PermissionSelector.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * File: PermissionSelector.cpp @@ -15,7 +15,7 @@ /// bugs 0 -namespace NewOS +namespace Kernel { PermissionSelector::PermissionSelector(const Int32& sel) : fRing((RingKind)sel) @@ -44,4 +44,4 @@ namespace NewOS { return this->fRing; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Pmm.cxx b/Kernel/Sources/Pmm.cxx index dc1168bd..22813206 100644 --- a/Kernel/Sources/Pmm.cxx +++ b/Kernel/Sources/Pmm.cxx @@ -15,7 +15,7 @@ #include <HALKit/AMD64/Processor.hpp> #endif -namespace NewOS +namespace Kernel { /// @brief Pmm constructor. Pmm::Pmm() @@ -93,4 +93,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx index ddeff7f2..316a9362 100644 --- a/Kernel/Sources/ProcessScheduler.cxx +++ b/Kernel/Sources/ProcessScheduler.cxx @@ -21,7 +21,7 @@ /* This file handles the process scheduling. */ /***********************************************************************************/ -namespace NewOS +namespace Kernel { /***********************************************************************************/ /// @brief Exit Code global @@ -397,4 +397,4 @@ namespace NewOS { return mTeam.AsArray().Count() == 0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ProcessTeam.cxx b/Kernel/Sources/ProcessTeam.cxx index f01841a6..b55ae855 100644 --- a/Kernel/Sources/ProcessTeam.cxx +++ b/Kernel/Sources/ProcessTeam.cxx @@ -11,7 +11,7 @@ #include <KernelKit/ProcessScheduler.hxx> -namespace NewOS +namespace Kernel { /// @brief Process list array getter. /// @return The list of process to schedule. @@ -33,6 +33,6 @@ namespace NewOS { return mCurrentProcess; } -} // namespace NewOS +} // namespace Kernel // last rev 05-03-24 diff --git a/Kernel/Sources/Property.cxx b/Kernel/Sources/Property.cxx index 285d7aaa..db1e0579 100644 --- a/Kernel/Sources/Property.cxx +++ b/Kernel/Sources/Property.cxx @@ -6,7 +6,7 @@ #include <CFKit/Property.hpp> -namespace NewOS +namespace Kernel { Property::Property(const StringView& sw) : fName(sw) @@ -25,4 +25,4 @@ namespace NewOS { return fAction; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/SMPManager.cxx b/Kernel/Sources/SMPManager.cxx index f00fbee1..8b0aca9b 100644 --- a/Kernel/Sources/SMPManager.cxx +++ b/Kernel/Sources/SMPManager.cxx @@ -11,10 +11,10 @@ ///! BUGS: 0 ///! @file SMPManager.cxx -///! @brief This file handles multi processing in NewOS. +///! @brief This file handles multi processing in Kernel. ///! @brief Multi processing is needed for multi-tasking operations. -namespace NewOS +namespace Kernel { ///! A HardwareThread class takes care of it's owned hardware thread. ///! It has a stack for it's core. @@ -244,4 +244,4 @@ namespace NewOS { return fThreadList.Count(); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Semaphore.cxx b/Kernel/Sources/Semaphore.cxx index 45fccbca..bef37fa8 100644 --- a/Kernel/Sources/Semaphore.cxx +++ b/Kernel/Sources/Semaphore.cxx @@ -7,7 +7,7 @@ #include <KernelKit/ProcessScheduler.hxx> #include <KernelKit/Semaphore.hpp> -namespace NewOS +namespace Kernel { bool Semaphore::Unlock() noexcept { @@ -59,4 +59,4 @@ namespace NewOS } } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Storage/AHCIDeviceInterface.cxx b/Kernel/Sources/Storage/AHCIDeviceInterface.cxx index 3d5632db..0366efe9 100644 --- a/Kernel/Sources/Storage/AHCIDeviceInterface.cxx +++ b/Kernel/Sources/Storage/AHCIDeviceInterface.cxx @@ -6,7 +6,7 @@ #include <StorageKit/AHCI.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Disk output diff --git a/Kernel/Sources/Storage/ATADeviceInterface.cxx b/Kernel/Sources/Storage/ATADeviceInterface.cxx index 95aded72..8c45f31b 100644 --- a/Kernel/Sources/Storage/ATADeviceInterface.cxx +++ b/Kernel/Sources/Storage/ATADeviceInterface.cxx @@ -6,7 +6,7 @@ #include <StorageKit/ATA.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Class constructor /// @param Out Disk output diff --git a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx index 1b85392e..9b2da7c2 100644 --- a/Kernel/Sources/Storage/NVMEDeviceInterface.cxx +++ b/Kernel/Sources/Storage/NVMEDeviceInterface.cxx @@ -6,10 +6,10 @@ #include <StorageKit/NVME.hpp> -namespace NewOS +namespace Kernel { const char* NVMEDeviceInterface::Name() const { return ("NVMEDeviceInterface"); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/String.cxx b/Kernel/Sources/String.cxx index fab12226..8dd4b7bf 100644 --- a/Kernel/Sources/String.cxx +++ b/Kernel/Sources/String.cxx @@ -8,7 +8,7 @@ #include <NewKit/Utils.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { Char* StringView::Data() { @@ -245,4 +245,4 @@ namespace NewOS return *this; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/ThreadLocalStorage.cxx b/Kernel/Sources/ThreadLocalStorage.cxx index 904488c1..40a7a75f 100644 --- a/Kernel/Sources/ThreadLocalStorage.cxx +++ b/Kernel/Sources/ThreadLocalStorage.cxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * NewOS + * Kernel * Copyright Zeta Electronics Corporation, all rights reserved. * * ======================================================== @@ -17,7 +17,7 @@ /// @brief TLS implementation in kernel. /***********************************************************************************/ -using namespace NewOS; +using namespace Kernel; /** * @brief Check for cookie inside TIB. @@ -44,7 +44,7 @@ Boolean tls_check_tib(ThreadInformationBlock* tib) * @param stackPtr The call frame. * @return */ -EXTERN_C Void tls_check_syscall_impl(NewOS::VoidPtr TIB) noexcept +EXTERN_C Void tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept { if (!TIB) return; diff --git a/Kernel/Sources/Timer.cxx b/Kernel/Sources/Timer.cxx index 8a26e50c..38e58b70 100644 --- a/Kernel/Sources/Timer.cxx +++ b/Kernel/Sources/Timer.cxx @@ -9,7 +9,7 @@ ///! BUGS: 0 ///! @file Timer.cxx -using namespace NewOS; +using namespace Kernel; /// @brief Unimplemented as it is an interface. Int32 HardwareTimerInterface::Wait() noexcept diff --git a/Kernel/Sources/URL.cxx b/Kernel/Sources/URL.cxx index 80f4d9d5..8d31da7c 100644 --- a/Kernel/Sources/URL.cxx +++ b/Kernel/Sources/URL.cxx @@ -10,7 +10,7 @@ /// BUGS: 0 -namespace NewOS +namespace Kernel { URL::URL(StringView& strUrl) : fUrlView(strUrl, false) @@ -93,4 +93,4 @@ namespace NewOS return Ref<ErrorOr<StringView>>(loc); } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/UserHeap.cxx b/Kernel/Sources/UserHeap.cxx index f20e30f8..453d1f30 100644 --- a/Kernel/Sources/UserHeap.cxx +++ b/Kernel/Sources/UserHeap.cxx @@ -16,7 +16,7 @@ /// KernelHeap.cxx /// BUGS: 0 -namespace NewOS +namespace Kernel { /** * @brief Process Heap Header @@ -253,4 +253,4 @@ namespace NewOS return -1; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/Sources/Utils.cxx b/Kernel/Sources/Utils.cxx index a307d416..37269ca1 100644 --- a/Kernel/Sources/Utils.cxx +++ b/Kernel/Sources/Utils.cxx @@ -7,7 +7,7 @@ #include <NewKit/Utils.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { Int rt_string_cmp(const Char* src, const Char* cmp, Size size) { @@ -208,45 +208,45 @@ namespace NewOS return str; } -} // namespace NewOS +} // namespace Kernel //////////////////////////////////////////////////////////////////////////////////////// /// Exported C functions //////////////////////////////////////////////////////////////////////////////////////// /// @brief memset in C++ -EXTERN_C void memset(void* dst, char src, NewOS::SizeT len) +EXTERN_C void memset(void* dst, char src, Kernel::SizeT len) { - NewOS::rt_set_memory(dst, src, len); + Kernel::rt_set_memory(dst, src, len); } /// @brief memcpy in C++ -EXTERN_C void memcpy(void* dst, void* src, NewOS::SizeT len) +EXTERN_C void memcpy(void* dst, void* src, Kernel::SizeT len) { - NewOS::rt_copy_memory(src, dst, len); + Kernel::rt_copy_memory(src, dst, len); } /// @brief memmove in C++ -EXTERN_C void* memmove(void* dst, void* src, NewOS::SizeT len) +EXTERN_C void* memmove(void* dst, void* src, Kernel::SizeT len) { - NewOS::rt_copy_memory(src, dst, len); + Kernel::rt_copy_memory(src, dst, len); return dst; } /// @brief strlen definition in C++. -EXTERN_C NewOS::SizeT strlen(const char* whatToCheck) +EXTERN_C Kernel::SizeT strlen(const char* whatToCheck) { - return NewOS::rt_string_len(whatToCheck); + return Kernel::rt_string_len(whatToCheck); } /// @brief memcmp in C++ -EXTERN_C NewOS::SizeT memcmp(void* dst, void* src, NewOS::SizeT len) +EXTERN_C Kernel::SizeT memcmp(void* dst, void* src, Kernel::SizeT len) { - return NewOS::rt_string_cmp((char*)src, (char*)dst, len); + return Kernel::rt_string_cmp((char*)src, (char*)dst, len); } /// @brief strcmp in C++ -EXTERN_C NewOS::SizeT strcmp(char* dst, char* src, NewOS::SizeT len) +EXTERN_C Kernel::SizeT strcmp(char* dst, char* src, Kernel::SizeT len) { - return NewOS::rt_string_cmp(src, dst, len); + return Kernel::rt_string_cmp(src, dst, len); } diff --git a/Kernel/Sources/Variant.cxx b/Kernel/Sources/Variant.cxx index fa74029d..7630f5db 100644 --- a/Kernel/Sources/Variant.cxx +++ b/Kernel/Sources/Variant.cxx @@ -6,7 +6,7 @@ #include <NewKit/Variant.hpp> -namespace NewOS +namespace Kernel { const Char* Variant::ToString() { @@ -21,4 +21,4 @@ namespace NewOS } } -} // namespace NewOS +} // namespace Kernel |
