diff options
Diffstat (limited to 'Private/KernelKit')
31 files changed, 86 insertions, 86 deletions
diff --git a/Private/KernelKit/CodeManager.hpp b/Private/KernelKit/CodeManager.hpp index ed42517a..5b06e4a4 100644 --- a/Private/KernelKit/CodeManager.hpp +++ b/Private/KernelKit/CodeManager.hpp @@ -20,7 +20,7 @@ #define kUPPNameLen 64 -namespace HCore { +namespace NewOS { /// \brief Much like Mac OS's UPP. /// This is read-only by design. /// It handles different kind of code. @@ -30,4 +30,4 @@ typedef struct UniversalProcedureTable final { const VoidPtr TRAP; const SizeT ARCH; } PACKED UniversalProcedureTableType; -} // namespace HCore
\ No newline at end of file +} // namespace NewOS
\ No newline at end of file diff --git a/Private/KernelKit/DebugOutput.hpp b/Private/KernelKit/DebugOutput.hpp index 457bc9d1..3f88fd0e 100644 --- a/Private/KernelKit/DebugOutput.hpp +++ b/Private/KernelKit/DebugOutput.hpp @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace HCore { +namespace NewOS { // @brief Emulates a VT100 terminal. class TerminalDevice final : public DeviceInterface<const Char *> { public: @@ -135,7 +135,7 @@ class DebuggerPortHeader final { Int16 fPort[kDebugMaxPorts]; Int16 fBoundCnt; }; -} // namespace HCore +} // namespace NewOS #ifdef kcout #undef kcout diff --git a/Private/KernelKit/DeviceManager.hpp b/Private/KernelKit/DeviceManager.hpp index 4eada620..10d23604 100644 --- a/Private/KernelKit/DeviceManager.hpp +++ b/Private/KernelKit/DeviceManager.hpp @@ -14,7 +14,7 @@ #pragma once -/* HCore device interface manager. */ +/* NewOS device interface manager. */ /* @file KernelKit/DeviceManager.hpp */ /* @brief Device abstraction and I/O buffer. */ @@ -24,7 +24,7 @@ // Last Rev // Sat Feb 24 CET 2024 -namespace HCore { +namespace NewOS { template <typename T> class DeviceInterface; @@ -105,4 +105,4 @@ enum { kDeviceTypeMedia, kDeviceTypeCount, }; -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/DriveManager.hxx b/Private/KernelKit/DriveManager.hxx index 8d0289aa..36e0b681 100644 --- a/Private/KernelKit/DriveManager.hxx +++ b/Private/KernelKit/DriveManager.hxx @@ -17,7 +17,7 @@ #define kDriveInvalidID -1 #define kDriveNameLen 32 -namespace HCore { +namespace NewOS { enum { kInvalidDrive = -1, kBlockDevice = 0xAD, @@ -103,6 +103,6 @@ class MountpointInterface final { private: DriveDevicePtr mA, mB, mC, mD = nullptr; }; -} // namespace HCore +} // namespace NewOS #endif /* ifndef __DRIVE_MANAGER__ */ diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp index 87de3d9e..1ce8d629 100644 --- a/Private/KernelKit/FileManager.hpp +++ b/Private/KernelKit/FileManager.hpp @@ -39,7 +39,7 @@ /// refer to first enum. #define kFileOpsCount 4 -namespace HCore { +namespace NewOS { enum { kFileWriteAll = 100, kFileReadAll = 101, @@ -244,6 +244,6 @@ FileStream<Encoding, Class>::FileStream(const Encoding *path, template <typename Encoding, typename Class> FileStream<Encoding, Class>::~FileStream() = default; -} // namespace HCore +} // namespace NewOS -#define node_cast(PTR) reinterpret_cast<HCore::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<NewOS::NodePtr>(PTR) diff --git a/Private/KernelKit/Framebuffer.hpp b/Private/KernelKit/Framebuffer.hpp index 397f62d0..d399f382 100644 --- a/Private/KernelKit/Framebuffer.hpp +++ b/Private/KernelKit/Framebuffer.hpp @@ -10,7 +10,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace HCore { +namespace NewOS { enum class FramebufferColorKind : UChar { RGB32, RGB16, @@ -75,12 +75,12 @@ const UInt32 kRgbGreen = 0x0000FF00; const UInt32 kRgbBlue = 0x00FF0000; const UInt32 kRgbBlack = 0x00000000; const UInt32 kRgbWhite = 0xFFFFFFFF; -} // namespace HCore +} // namespace NewOS /***********************************************************************************/ /// Color macros. /***********************************************************************************/ -#define RGB(R, G, B) (HCore::UInt32)(0x##R##G##B) +#define RGB(R, G, B) (NewOS::UInt32)(0x##R##G##B) #endif /* ifndef __INC_FB_HPP__ */ diff --git a/Private/KernelKit/HError.hpp b/Private/KernelKit/HError.hpp index 4b943296..6885003f 100644 --- a/Private/KernelKit/HError.hpp +++ b/Private/KernelKit/HError.hpp @@ -9,7 +9,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/ErrorID.hpp> -namespace HCore { +namespace NewOS { typedef Int32 HError; inline constexpr HError kErrorSuccess = 0; @@ -34,10 +34,10 @@ inline constexpr HError kErrorForkAlreadyExists = 50; inline constexpr HError kErrorUnimplemented = 0; Boolean ke_bug_check(void) noexcept; -} // namespace HCore +} // namespace NewOS -#define DbgOk() (kLastError == HCore::kErrorSuccess) -#define DbgFailed() (kLastError != HCore::kErrorSuccess) +#define DbgOk() (kLastError == NewOS::kErrorSuccess) +#define DbgFailed() (kLastError != NewOS::kErrorSuccess) #define DbgLastError() kLastError -inline HCore::HError kLastError = 0; +inline NewOS::HError kLastError = 0; diff --git a/Private/KernelKit/KernelHeap.hpp b/Private/KernelKit/KernelHeap.hpp index f8c1c9c3..69c84b7f 100644 --- a/Private/KernelKit/KernelHeap.hpp +++ b/Private/KernelKit/KernelHeap.hpp @@ -12,9 +12,9 @@ #include <NewKit/Defines.hpp> -namespace HCore { +namespace NewOS { Int32 ke_delete_ke_heap(voidPtr allocatedPtr); Boolean ke_is_valid_heap(VoidPtr ptr); voidPtr ke_new_ke_heap(SizeT sz, const bool rw, const bool user); Boolean ke_protect_ke_heap(VoidPtr heapPtr); -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/LoaderInterface.hpp b/Private/KernelKit/LoaderInterface.hpp index 5beb403f..c4634ca4 100644 --- a/Private/KernelKit/LoaderInterface.hpp +++ b/Private/KernelKit/LoaderInterface.hpp @@ -11,7 +11,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/ErrorOr.hpp> -namespace HCore { +namespace NewOS { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss class LoaderInterface { @@ -28,4 +28,4 @@ class LoaderInterface { virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const char* name, _Input Int32 kind) = 0; }; -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/LockDelegate.hpp b/Private/KernelKit/LockDelegate.hpp index 0fd9ba63..07f492a8 100644 --- a/Private/KernelKit/LockDelegate.hpp +++ b/Private/KernelKit/LockDelegate.hpp @@ -12,7 +12,7 @@ #define kLockDone (200U) /* job is done */ #define kLockTimedOut (100U) /* job has timed out */ -namespace HCore +namespace NewOS { /// @brief Lock condition pointer. typedef Boolean* LockPtr; @@ -61,4 +61,4 @@ class LockDelegate final private: Atom<UInt> m_LockStatus; }; -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/MSDOS.hpp b/Private/KernelKit/MSDOS.hpp index aa7f9b8c..1fe99a60 100644 --- a/Private/KernelKit/MSDOS.hpp +++ b/Private/KernelKit/MSDOS.hpp @@ -3,7 +3,7 @@ Copyright Mahrouss Logic File: MSDOS.hpp - Purpose: MS-DOS header for HCore. + Purpose: MS-DOS header for NewOS. Revision History: @@ -23,11 +23,11 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef HCore::UInt32 DosWord; -typedef HCore::Long DosLong; +typedef NewOS::UInt32 DosWord; +typedef NewOS::Long DosLong; typedef struct _DosHeader { - HCore::UInt8 eMagic[2]; + NewOS::UInt8 eMagic[2]; DosWord eMagLen; DosWord ePagesCount; DosWord eCrlc; @@ -48,7 +48,7 @@ typedef struct _DosHeader { DosLong eLfanew; } DosHeader, *DosHeaderPtr; -namespace HCore { +namespace NewOS { /// @brief Find the PE header inside the the blob. inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr { if (!ptrDos) return nullptr; @@ -57,6 +57,6 @@ inline auto rt_find_exec_header(DosHeaderPtr ptrDos) -> VoidPtr { return (VoidPtr)(&ptrDos->eLfanew + 1); } -} // namespace HCore +} // namespace NewOS #endif /* ifndef __MSDOS_EXEC__ */ diff --git a/Private/KernelKit/PCI/Database.hpp b/Private/KernelKit/PCI/Database.hpp index 773677d6..b79f7b57 100644 --- a/Private/KernelKit/PCI/Database.hpp +++ b/Private/KernelKit/PCI/Database.hpp @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.hpp> #include <NewKit/Defines.hpp> -namespace HCore { +namespace NewOS { namespace Types { // https://wiki.osdev.org/PCI enum class PciDeviceKind : UChar { @@ -32,4 +32,4 @@ namespace HCore { Invalid = Unassgined, }; } // namespace Types -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/PCI/Device.hpp b/Private/KernelKit/PCI/Device.hpp index 08371f12..c73ca068 100644 --- a/Private/KernelKit/PCI/Device.hpp +++ b/Private/KernelKit/PCI/Device.hpp @@ -7,7 +7,7 @@ #include <NewKit/Defines.hpp> -namespace HCore::PCI +namespace NewOS::PCI { enum class PciConfigKind : UShort { @@ -74,8 +74,8 @@ namespace HCore::PCI UShort m_Bar; }; -} // namespace HCore::PCI +} // namespace NewOS::PCI -extern "C" void LumiaPCISetCfgTarget(HCore::UInt bar); -extern "C" HCore::UInt LumiaPCIReadRaw(HCore::UInt bar); +extern "C" void LumiaPCISetCfgTarget(NewOS::UInt bar); +extern "C" NewOS::UInt LumiaPCIReadRaw(NewOS::UInt bar); diff --git a/Private/KernelKit/PCI/Dma.hpp b/Private/KernelKit/PCI/Dma.hpp index d5df4c3d..1e1b5036 100644 --- a/Private/KernelKit/PCI/Dma.hpp +++ b/Private/KernelKit/PCI/Dma.hpp @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.hpp> #include <NewKit/Ref.hpp> -namespace HCore { +namespace NewOS { enum class DmaKind { PCI, // Bus mastering is required to be turned on. Basiaclly a request // control system. 64-Bit access depends on the PAE bit and the device @@ -70,6 +70,6 @@ class DMAFactory final { public: static OwnPtr<IOBuf<Char *>> Construct(OwnPtr<DMAWrapper> &dma); }; -} // namespace HCore +} // namespace NewOS #include <KernelKit/PCI/Dma.inl> diff --git a/Private/KernelKit/PCI/Dma.inl b/Private/KernelKit/PCI/Dma.inl index ac0214af..5f7e1379 100644 --- a/Private/KernelKit/PCI/Dma.inl +++ b/Private/KernelKit/PCI/Dma.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace HCore +namespace NewOS { template<class T> T* DMAWrapper::operator->() diff --git a/Private/KernelKit/PCI/IO-Impl-AMD64.inl b/Private/KernelKit/PCI/IO-Impl-AMD64.inl index f720f2b6..195ebca1 100644 --- a/Private/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/Private/KernelKit/PCI/IO-Impl-AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace HCore { +namespace NewOS { template <SizeT Sz> template <typename T> T IOArray<Sz>::In(SizeT index) { @@ -44,4 +44,4 @@ void IOArray<Sz>::Out(SizeT index, T value) { break; } } -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/PCI/IO.hpp b/Private/KernelKit/PCI/IO.hpp index a58bd955..87a29b78 100644 --- a/Private/KernelKit/PCI/IO.hpp +++ b/Private/KernelKit/PCI/IO.hpp @@ -11,7 +11,7 @@ #include <NewKit/Defines.hpp> #include <NewKit/Ref.hpp> -namespace HCore { +namespace NewOS { template <SizeT Sz> class IOArray final { public: @@ -40,7 +40,7 @@ class IOArray final { }; using IOArray16 = IOArray<16>; -} // namespace HCore +} // namespace NewOS #ifdef __x86_64__ #include <KernelKit/PCI/IO-Impl-AMD64.inl> diff --git a/Private/KernelKit/PCI/Iterator.hpp b/Private/KernelKit/PCI/Iterator.hpp index 89e1f246..f1069fda 100644 --- a/Private/KernelKit/PCI/Iterator.hpp +++ b/Private/KernelKit/PCI/Iterator.hpp @@ -11,7 +11,7 @@ #define ME_DEVICE_COUNT (33) #define ME_FUNCTION_COUNT (8) -namespace HCore::PCI { +namespace NewOS::PCI { class Iterator final { public: Iterator() = delete; @@ -31,6 +31,6 @@ namespace HCore::PCI { private: Array<PCI::Device, ME_BUS_COUNT> m_Devices; }; -} // namespace HCore::PCI +} // namespace NewOS::PCI #endif // __PCI_ITERATOR_HPP__ diff --git a/Private/KernelKit/PCI/PCI.hpp b/Private/KernelKit/PCI/PCI.hpp index c93150b2..65e199ad 100644 --- a/Private/KernelKit/PCI/PCI.hpp +++ b/Private/KernelKit/PCI/PCI.hpp @@ -14,7 +14,7 @@ #define PCI_FUNC_COUNT (8) #define PCI_BUS_COUNT (255) -namespace HCore::PCI { +namespace NewOS::PCI { // model struct DeviceHeader { UInt16 VendorId; @@ -50,4 +50,4 @@ namespace HCore::PCI { Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace HCore::PCI +} // namespace NewOS::PCI diff --git a/Private/KernelKit/PE.hpp b/Private/KernelKit/PE.hpp index 3fd4f965..f397ff48 100644 --- a/Private/KernelKit/PE.hpp +++ b/Private/KernelKit/PE.hpp @@ -3,7 +3,7 @@ Copyright Mahrouss Logic File: PE.hpp - Purpose: Portable Executable for HCore. + Purpose: Portable Executable for NewOS. Revision History: @@ -19,10 +19,10 @@ namespace Detail { - typedef HCore::UIntPtr PE_QWORD; - typedef HCore::UInt32 PE_DWORD; - typedef HCore::UInt16 PE_WORD; - typedef HCore::UChar PE_BYTE; + typedef NewOS::UIntPtr PE_QWORD; + typedef NewOS::UInt32 PE_DWORD; + typedef NewOS::UInt16 PE_WORD; + typedef NewOS::UChar PE_BYTE; } // namespace Detail #define kPeMagic 0x00004550 diff --git a/Private/KernelKit/PEF.hpp b/Private/KernelKit/PEF.hpp index df95d82e..a86cd154 100644 --- a/Private/KernelKit/PEF.hpp +++ b/Private/KernelKit/PEF.hpp @@ -3,7 +3,7 @@ Copyright Mahrouss Logic File: PEF.hpp - Purpose: Preferred Executable Format for HCore. + Purpose: Preferred Executable Format for NewOS. Revision History: @@ -32,7 +32,7 @@ /// The PEF also uses the x64 PE calling convention and ABI. /// It's just that the container are different. -namespace HCore { +namespace NewOS { enum { kPefArchIntel86S, kPefArchAMD64, @@ -85,7 +85,7 @@ enum { kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace HCore +} // namespace NewOS #define kPefExt ".exe" #define kPefDylibExt ".dll" @@ -93,7 +93,7 @@ enum { #define kPefObjectExt ".obj" #define kPefDebugExt ".dbg" -// HCore System Binary Interface. +// NewOS System Binary Interface. #define kPefAbi (0xDEAD2) #define kPefStart "__start" diff --git a/Private/KernelKit/PEFCodeManager.hxx b/Private/KernelKit/PEFCodeManager.hxx index e952d40f..45b475f5 100644 --- a/Private/KernelKit/PEFCodeManager.hxx +++ b/Private/KernelKit/PEFCodeManager.hxx @@ -13,7 +13,7 @@ #define kPefApplicationMime "application/x-hcore-exec" -namespace HCore { +namespace NewOS { /// /// \name PEFLoader /// \brief PEF loader class. @@ -54,6 +54,6 @@ class PEFLoader : public LoaderInterface { namespace Utils { bool execute_from_image(PEFLoader &exec) noexcept; } // namespace Utils -} // namespace HCore +} // namespace NewOS #endif // ifndef _INC_CODE_MANAGER_PEF_ diff --git a/Private/KernelKit/PEFSharedObject.hxx b/Private/KernelKit/PEFSharedObject.hxx index 0684b2a7..41ee2b97 100644 --- a/Private/KernelKit/PEFSharedObject.hxx +++ b/Private/KernelKit/PEFSharedObject.hxx @@ -1,7 +1,7 @@ /* * ======================================================== * - * HCore + * NewOS * Copyright Mahrouss Logic, all rights reserved. * * ======================================================== @@ -15,7 +15,7 @@ #include <KernelKit/PEFCodeManager.hxx> #include <NewKit/Defines.hpp> -namespace HCore { +namespace NewOS { /// @brief Pure implementation, missing method/function handler. extern "C" void __mh_purecall(void); @@ -87,6 +87,6 @@ class SharedObject final { }; typedef SharedObject *SharedObjectPtr; -} // namespace HCore +} // namespace NewOS #endif /* ifndef __KERNELKIT_SHARED_OBJECT_HXX__ */ diff --git a/Private/KernelKit/PermissionSelector.hxx b/Private/KernelKit/PermissionSelector.hxx index c5a55fee..c252c9d0 100644 --- a/Private/KernelKit/PermissionSelector.hxx +++ b/Private/KernelKit/PermissionSelector.hxx @@ -20,7 +20,7 @@ // hash 'user@host:password' -> base64 encoded data // use this data to then fetch specific data. -namespace HCore { +namespace NewOS { enum class RingKind { kRingUser = 3, kRingDriver = 2, @@ -49,6 +49,6 @@ class PermissionSelector final { private: RingKind fRing; }; -} // namespace HCore +} // namespace NewOS #endif /* ifndef _INC_PERMISSION_SEL_HPP */ diff --git a/Private/KernelKit/ProcessScheduler.hpp b/Private/KernelKit/ProcessScheduler.hpp index 1b55be4a..0cc531b9 100644 --- a/Private/KernelKit/ProcessScheduler.hpp +++ b/Private/KernelKit/ProcessScheduler.hpp @@ -23,7 +23,7 @@ //////////////////////////////////////////////////// -namespace HCore { +namespace NewOS { class ProcessHeader; class ProcessTeam; class ProcessScheduler; @@ -124,7 +124,7 @@ class ProcessHeader final { void SetEntrypoint(UIntPtr &imageStart) noexcept; public: - Char Name[kProcessLen] = {"HCore Process"}; + Char Name[kProcessLen] = {"NewOS Process"}; ProcessSubsystem SubSystem{0}; ProcessSelector Selector{ProcessSelector::kRingUser}; HAL::StackFramePtr StackFrame{nullptr}; @@ -250,7 +250,7 @@ class ProcessHelper final { }; const Int32 &rt_get_exit_code() noexcept; -} // namespace HCore +} // namespace NewOS #include <KernelKit/ThreadLocalStorage.hxx> diff --git a/Private/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp index c207be82..b4d04dde 100644 --- a/Private/KernelKit/SMPManager.hpp +++ b/Private/KernelKit/SMPManager.hpp @@ -16,7 +16,7 @@ #define kMaxHarts 8 -namespace HCore { +namespace NewOS { using ThreadID = UInt32; enum ThreadKind { @@ -117,6 +117,6 @@ Void rt_wakeup_thread(HAL::StackFramePtr stack); /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void rt_hang_thread(HAL::StackFramePtr stack); -} // namespace HCore +} // namespace NewOS #endif // !__SMP_MANAGER__ diff --git a/Private/KernelKit/Semaphore.hpp b/Private/KernelKit/Semaphore.hpp index 9b9dbef3..0e41aa49 100644 --- a/Private/KernelKit/Semaphore.hpp +++ b/Private/KernelKit/Semaphore.hpp @@ -9,7 +9,7 @@ #include <NewKit/Defines.hpp> #include <CompilerKit/CompilerKit.hxx> -namespace HCore +namespace NewOS { class ProcessHeader; diff --git a/Private/KernelKit/ThreadLocalStorage.hxx b/Private/KernelKit/ThreadLocalStorage.hxx index 09017fc0..4abd9ecd 100644 --- a/Private/KernelKit/ThreadLocalStorage.hxx +++ b/Private/KernelKit/ThreadLocalStorage.hxx @@ -29,21 +29,21 @@ T *tls_new_class(Args &&...args); /// @brief Thread Information Block for Local Storage. /// Located in GS on AMD64, Virtual Address 0x10000 (64x0, 32x0, ARM64) struct PACKED ThreadInformationBlock final { - HCore::Char Cookie[kTLSCookieLen]; - HCore::UIntPtr StartCode; // Start Address - HCore::UIntPtr StartData; // Allocation Heap - HCore::UIntPtr StartStack; // Stack Pointer. - HCore::Int32 ThreadID; // Thread execution ID. + NewOS::Char Cookie[kTLSCookieLen]; + NewOS::UIntPtr StartCode; // Start Address + NewOS::UIntPtr StartData; // Allocation Heap + NewOS::UIntPtr StartStack; // Stack Pointer. + NewOS::Int32 ThreadID; // Thread execution ID. }; /// @brief TLS install TIB -EXTERN_C void rt_install_tib(ThreadInformationBlock *pTib, HCore::VoidPtr pPib); +EXTERN_C void rt_install_tib(ThreadInformationBlock *pTib, NewOS::VoidPtr pPib); ///! @brief Cookie Sanity check. -HCore::Boolean tls_check_tib(ThreadInformationBlock* ptr); +NewOS::Boolean tls_check_tib(ThreadInformationBlock* ptr); /// @brief TLS check system call -EXTERN_C HCore::Void tls_check_syscall_impl(HCore::HAL::StackFramePtr stackPtr) noexcept; +EXTERN_C NewOS::Void tls_check_syscall_impl(NewOS::HAL::StackFramePtr stackPtr) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/Private/KernelKit/ThreadLocalStorage.inl b/Private/KernelKit/ThreadLocalStorage.inl index fe2d02d0..2b920d0f 100644 --- a/Private/KernelKit/ThreadLocalStorage.inl +++ b/Private/KernelKit/ThreadLocalStorage.inl @@ -12,7 +12,7 @@ template <typename T> inline T* tls_new_ptr(void) { - using namespace HCore; + using namespace NewOS; MUST_PASS(ProcessScheduler::Shared().Leak().GetCurrent()); @@ -27,7 +27,7 @@ template <typename T> inline bool tls_delete_ptr(T* ptr) { if (!ptr) return false; - using namespace HCore; + using namespace NewOS; MUST_PASS(ProcessScheduler::Shared().Leak().GetCurrent()); @@ -42,7 +42,7 @@ T* tls_new_class(Args&&... args) { T* ptr = tls_new_ptr<T>(); if (ptr) { - *ptr = T(HCore::forward(args)...); + *ptr = T(NewOS::forward(args)...); return ptr; } diff --git a/Private/KernelKit/Timer.hpp b/Private/KernelKit/Timer.hpp index f60f6e0e..87cb915d 100644 --- a/Private/KernelKit/Timer.hpp +++ b/Private/KernelKit/Timer.hpp @@ -11,7 +11,7 @@ #include <NewKit/ErrorID.hpp> -namespace HCore +namespace NewOS { class HardwareTimer; class HardwareTimerInterface; @@ -62,4 +62,4 @@ inline Int64 Milliseconds(Int64 time) return 1000 / Seconds(time); } -} // namespace HCore +} // namespace NewOS diff --git a/Private/KernelKit/UserHeap.hpp b/Private/KernelKit/UserHeap.hpp index d66eb356..728fcd80 100644 --- a/Private/KernelKit/UserHeap.hpp +++ b/Private/KernelKit/UserHeap.hpp @@ -20,7 +20,7 @@ #define kUserHeapMaxSz (4096) #define kUserHeapMag (0x5500A1) -namespace HCore { +namespace NewOS { typedef enum { kUserHeapHypervisor = 0x2, kUserHeapShared = 0x4, @@ -37,4 +37,4 @@ VoidPtr rt_new_heap(Int32 flags); /// @param pointer The process heap pointer. /// @return Int32 rt_free_heap(voidPtr pointer); -} // namespace HCore +} // namespace NewOS |