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/HALKit | |
| 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/HALKit')
38 files changed, 201 insertions, 201 deletions
diff --git a/Kernel/HALKit/64x0/HalVirtualMemory.cxx b/Kernel/HALKit/64x0/HalVirtualMemory.cxx index bb4357f4..f62f888f 100644 --- a/Kernel/HALKit/64x0/HalVirtualMemory.cxx +++ b/Kernel/HALKit/64x0/HalVirtualMemory.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Flush system TLB, looks like the POWER version, as it acts the same, no specific instruction for that. /// @note The 88K MMU should be present as well. diff --git a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx index 7a54edfa..ca6a7417 100644 --- a/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx +++ b/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cxx @@ -10,7 +10,7 @@ #include <ArchKit/ArchKit.hpp> #include <KernelKit/KernelHeap.hpp> -namespace NewOS +namespace Kernel { /// Custom to the virtual machine, you'll need to parse the MADT instead. @@ -138,4 +138,4 @@ namespace NewOS return chr == 0; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp index 657ab622..f41ee55e 100644 --- a/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp +++ b/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cpp @@ -10,84 +10,84 @@ /// @brief Handle GPF fault. /// @param rsp -EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: General Protection Fault, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle page fault. /// @param rsp -EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Segmentation Fault, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle math fault. /// @param rsp -EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Math error, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle any generic fault. /// @param rsp -EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Execution error, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Handle #UD fault. /// @param rsp -EXTERN_C void idt_handle_ud(NewOS::UIntPtr rsp) +EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) { - NewOS::kcout + Kernel::kcout << "newoskrnl: Invalid interrupt, caused by " - << NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); + << Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().GetName(); - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Crash(); } /// @brief Enter syscall from assembly. /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NewOS::Void hal_system_call_enter(NewOS::UIntPtr rcx, NewOS::UIntPtr rdx) +EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx, Kernel::UIntPtr rdx) { if (rcx <= (kSyscalls.Count() - 1)) { - NewOS::kcout << "newoskrnl: syscall: enter.\r"; + Kernel::kcout << "newoskrnl: syscall: enter.\r"; if (kSyscalls[rcx].Leak().Leak()->fHooked) - (kSyscalls[rcx].Leak().Leak()->fProc)((NewOS::VoidPtr)rdx); + (kSyscalls[rcx].Leak().Leak()->fProc)((Kernel::VoidPtr)rdx); - NewOS::kcout << "newoskrnl: syscall: exit.\r"; + Kernel::kcout << "newoskrnl: syscall: exit.\r"; } } /// @brief Enter kernel call from assembly (DDK only). /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C NewOS::Void hal_kernel_call_enter(NewOS::UIntPtr rcx, NewOS::UIntPtr rdx, NewOS::UIntPtr r8, NewOS::UIntPtr r9) +EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx, Kernel::UIntPtr rdx, Kernel::UIntPtr r8, Kernel::UIntPtr r9) { if (rcx != 0) { - NewOS::kcout << "newoskrnl: kerncall: enter.\r"; + Kernel::kcout << "newoskrnl: kerncall: enter.\r"; - NewOS::kcout << "newoskrnl: kerncall: exit.\r"; + Kernel::kcout << "newoskrnl: kerncall: exit.\r"; } } diff --git a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp index dfa02b11..94fe68ad 100644 --- a/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp +++ b/Kernel/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp @@ -28,7 +28,7 @@ EXTERN_C void _hal_enable_smp(void); /////////////////////////////////////////////////////////////////////////////////////// -namespace NewOS::HAL +namespace Kernel::HAL { constexpr Int32 kThreadAPIC = 0; constexpr Int32 kThreadLAPIC = 1; @@ -142,8 +142,8 @@ namespace NewOS::HAL /// @return Void hal_send_start_ipi(UInt32 apicId, UInt8 vector, UInt32 targetAddress) { - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_SIPI_Vector | vector); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_SIPI_Vector | vector); } EXTERN_C Void _hal_spin_core(Void); @@ -155,8 +155,8 @@ namespace NewOS::HAL /// @return Void hal_send_end_ipi(UInt32 apicId, UInt8 vector, UInt32 targetAddress) { - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); - NewOS::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_EIPI_Vector | vector); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_High, apicId << 24); + Kernel::ke_dma_write(targetAddress, kAPIC_ICR_Low, kAPIC_EIPI_Vector | vector); } STATIC HAL::StackFramePtr cFramePtr = nullptr; @@ -232,18 +232,18 @@ namespace NewOS::HAL /// Start local APIC now. /////////////////////////////////////////////////////////////////////////// - auto flagsSet = NewOS::ke_dma_read(cBaseAddressAPIC, 0xF0); // SVR register. + auto flagsSet = Kernel::ke_dma_read(cBaseAddressAPIC, 0xF0); // SVR register. // enable APIC. flagsSet |= 0x100; - NewOS::ke_dma_write(cBaseAddressAPIC, 0xF0, flagsSet); + Kernel::ke_dma_write(cBaseAddressAPIC, 0xF0, flagsSet); /// Set sprurious interrupt vector. - NewOS::ke_dma_write(cBaseAddressAPIC, 0xF0, 0x100 | 0xFF); + Kernel::ke_dma_write(cBaseAddressAPIC, 0xF0, 0x100 | 0xFF); // highest task priority. for our realtime kernel. - NewOS::ke_dma_write(cBaseAddressAPIC, 0x21, 0); + Kernel::ke_dma_write(cBaseAddressAPIC, 0x21, 0); cProgramInitialized = new Boolean(true); @@ -257,6 +257,6 @@ namespace NewOS::HAL ke_stop(RUNTIME_CHECK_FAILED); } } -} // namespace NewOS::HAL +} // namespace Kernel::HAL /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Kernel/HALKit/AMD64/HalDebugOutput.cxx b/Kernel/HALKit/AMD64/HalDebugOutput.cxx index 25c1546e..3dd70dc6 100644 --- a/Kernel/HALKit/AMD64/HalDebugOutput.cxx +++ b/Kernel/HALKit/AMD64/HalDebugOutput.cxx @@ -9,7 +9,7 @@ #include <KernelKit/Framebuffer.hpp> #include <NewKit/Utils.hpp> -namespace NewOS +namespace Kernel { enum CommStatus { @@ -137,9 +137,9 @@ namespace NewOS static TerminalDevice* out = nullptr; if (!out) - out = new TerminalDevice(NewOS::ke_io_write, NewOS::ke_io_read); + out = new TerminalDevice(Kernel::ke_io_write, Kernel::ke_io_read); return *out; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalDebugPort.cxx b/Kernel/HALKit/AMD64/HalDebugPort.cxx index 2644e247..a29a8129 100644 --- a/Kernel/HALKit/AMD64/HalDebugPort.cxx +++ b/Kernel/HALKit/AMD64/HalDebugPort.cxx @@ -12,7 +12,7 @@ // after that we have start of additional data. -namespace NewOS +namespace Kernel { void rt_debug_listen(DebuggerPortHeader* theHook) noexcept { @@ -37,4 +37,4 @@ namespace NewOS theHook->fBoundCnt++; } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp b/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp index 48f57cc0..964b402a 100644 --- a/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp +++ b/Kernel/HALKit/AMD64/HalDescriptorLoader.cpp @@ -6,14 +6,14 @@ #include <ArchKit/ArchKit.hpp> -namespace NewOS::HAL +namespace Kernel::HAL { namespace Detail { STATIC RegisterGDT kRegGdt; STATIC HAL::Register64 kRegIdt; - STATIC ::NewOS::Detail::AMD64::InterruptDescriptorAMD64 + STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64 kInterruptVectorTable[kKernelIdtSize]; STATIC Void RemapPIC(Void) noexcept @@ -51,7 +51,7 @@ namespace NewOS::HAL Void IDTLoader::Load(Register64& idt) { - volatile ::NewOS::UIntPtr** baseIdt = (volatile ::NewOS::UIntPtr**)idt.Base; + volatile ::Kernel::UIntPtr** baseIdt = (volatile ::Kernel::UIntPtr**)idt.Base; MUST_PASS(baseIdt); @@ -72,7 +72,7 @@ namespace NewOS::HAL } Detail::kRegIdt.Base = reinterpret_cast<UIntPtr>(Detail::kInterruptVectorTable); - Detail::kRegIdt.Limit = sizeof(::NewOS::Detail::AMD64::InterruptDescriptorAMD64) * + Detail::kRegIdt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) * (kKernelIdtSize - 1); hal_load_idt(Detail::kRegIdt); @@ -87,4 +87,4 @@ namespace NewOS::HAL { IDTLoader::Load(idt.Leak()); } -} // namespace NewOS::HAL +} // namespace Kernel::HAL diff --git a/Kernel/HALKit/AMD64/HalHart.cpp b/Kernel/HALKit/AMD64/HalHart.cpp index 4718d4ab..2a12ec50 100644 --- a/Kernel/HALKit/AMD64/HalHart.cpp +++ b/Kernel/HALKit/AMD64/HalHart.cpp @@ -8,7 +8,7 @@ // bugs = 0 -namespace NewOS +namespace Kernel { /// @brief wakes up thread. /// wakes up thread from hang. @@ -30,4 +30,4 @@ namespace NewOS /* nohing, code is spinning */ } } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalInstallTIB.asm b/Kernel/HALKit/AMD64/HalInstallTIB.asm index 9111c835..aad5d6d0 100644 --- a/Kernel/HALKit/AMD64/HalInstallTIB.asm +++ b/Kernel/HALKit/AMD64/HalInstallTIB.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/HalKernelMain.cxx b/Kernel/HALKit/AMD64/HalKernelMain.cxx index d8c60e25..628314b5 100644 --- a/Kernel/HALKit/AMD64/HalKernelMain.cxx +++ b/Kernel/HALKit/AMD64/HalKernelMain.cxx @@ -20,19 +20,19 @@ #include <NetworkKit/IPCEP.hxx> #define KERNEL_INIT(X) X; \ - NewOS::ke_stop(RUNTIME_CHECK_BOOTSTRAP); + Kernel::ke_stop(RUNTIME_CHECK_BOOTSTRAP); /// @brief This symbol is the kernel main symbol. EXTERN_C void KeMain(); -EXTERN_C NewOS::VoidPtr kInterruptVectorTable[]; +EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; struct PACKED HeapAllocInfo final { - NewOS::VoidPtr fThe; - NewOS::Size fTheSz; + Kernel::VoidPtr fThe; + Kernel::Size fTheSz; }; struct PACKED ProcessBlockInfo final @@ -45,19 +45,19 @@ struct PACKED ProcessExitInfo final { STATIC constexpr auto cReasonLen = 512; - NewOS::Int64 fCode; - NewOS::Char fReason[cReasonLen]; + Kernel::Int64 fCode; + Kernel::Char fReason[cReasonLen]; }; -namespace NewOS::HAL +namespace Kernel::HAL { /// @brief Gets the system cores using the MADT. /// @param rsdPtr The 'RSD PTR' data structure. - extern void hal_system_get_cores(NewOS::voidPtr rsdPtr); -} // namespace NewOS::HAL + extern void hal_system_get_cores(Kernel::voidPtr rsdPtr); +} // namespace Kernel::HAL /* GDT. */ -STATIC NewOS::HAL::Detail::NewOSGDT cGdt = { +STATIC Kernel::HAL::Detail::NewOSGDT cGdt = { {0, 0, 0, 0x00, 0x00, 0}, // null entry {0, 0, 0, 0x9a, 0xaf, 0}, // kernel code {0, 0, 0, 0x92, 0xaf, 0}, // kernel data @@ -67,7 +67,7 @@ STATIC NewOS::HAL::Detail::NewOSGDT cGdt = { }; EXTERN_C void hal_init_platform( - NewOS::HEL::HandoverInformationHeader* HandoverHeader) + Kernel::HEL::HandoverInformationHeader* HandoverHeader) { /* Setup globals. */ @@ -80,28 +80,28 @@ EXTERN_C void hal_init_platform( } kKernelVirtualSize = HandoverHeader->f_VirtualSize; - kKernelVirtualStart = reinterpret_cast<NewOS::VoidPtr>( - reinterpret_cast<NewOS::UIntPtr>(HandoverHeader->f_VirtualStart) + cHeapStartOffset); + kKernelVirtualStart = reinterpret_cast<Kernel::VoidPtr>( + reinterpret_cast<Kernel::UIntPtr>(HandoverHeader->f_VirtualStart) + cHeapStartOffset); kKernelPhysicalStart = HandoverHeader->f_PhysicalStart; // Load memory descriptors. - NewOS::HAL::RegisterGDT gdtBase; + Kernel::HAL::RegisterGDT gdtBase; - gdtBase.Base = reinterpret_cast<NewOS::UIntPtr>(&cGdt); - gdtBase.Limit = sizeof(NewOS::HAL::Detail::NewOSGDT) - 1; + gdtBase.Base = reinterpret_cast<Kernel::UIntPtr>(&cGdt); + gdtBase.Limit = sizeof(Kernel::HAL::Detail::NewOSGDT) - 1; - CONST NewOS::HAL::GDTLoader cGDT; + CONST Kernel::HAL::GDTLoader cGDT; cGDT.Load(gdtBase); // Load IDT now. - NewOS::HAL::Register64 idtBase; - idtBase.Base = (NewOS::UIntPtr)kInterruptVectorTable; + Kernel::HAL::Register64 idtBase; + idtBase.Base = (Kernel::UIntPtr)kInterruptVectorTable; idtBase.Limit = 0; - CONST NewOS::HAL::IDTLoader cIDT; + CONST Kernel::HAL::IDTLoader cIDT; cIDT.Load(idtBase); // Register the basic SCI functions. @@ -126,40 +126,40 @@ EXTERN_C void hal_init_platform( constexpr auto cLPCCloseMsg = 0x27; constexpr auto cLPCSanitizeMsg = 0x28; - kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cSerialAlertInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { const char* msg = (const char*)rdx; - NewOS::kcout << "Native Log: " << msg << "\r"; + Kernel::kcout << "Native Log: " << msg << "\r"; }; - kSyscalls[cTlsInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cTlsInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { tls_check_syscall_impl(rdx); }; - kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ipc_sanitize_packet(reinterpret_cast<NewOS::IPCEPMessageHeader*>(rdx)); + kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ipc_sanitize_packet(reinterpret_cast<Kernel::IPCEPMessageHeader*>(rdx)); }; - kSyscalls[cNewInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cNewInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { // get HAC struct. HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx); if (!rdxInf) return; // assign the fThe field with the pointer. - rdxInf->fThe = NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().New(rdxInf->fTheSz); + rdxInf->fThe = Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().New(rdxInf->fTheSz); }; - kSyscalls[cDeleteInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cDeleteInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { // get HAC struct. HeapAllocInfo* rdxInf = reinterpret_cast<HeapAllocInfo*>(rdx); if (!rdxInf) return; // delete ptr with sz in mind. - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Delete(rdxInf->fThe, rdxInf->fTheSz); + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Delete(rdxInf->fThe, rdxInf->fTheSz); }; - kSyscalls[cTlsInstallInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cTlsInstallInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessBlockInfo* rdxPb = reinterpret_cast<ProcessBlockInfo*>(rdx); if (!rdxPb) return; @@ -168,30 +168,30 @@ EXTERN_C void hal_init_platform( rt_install_tib(rdxPb->fTIB, rdxPb->fPIB); }; - kSyscalls[cExitInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx); if (!rdxEi) return; - NewOS::kcout << "newoskrnl: " << rdxEi->fReason << "\r"; - NewOS::ProcessScheduler::The().Leak().TheCurrent().Leak().Exit(rdxEi->fCode); + Kernel::kcout << "newoskrnl: " << rdxEi->fReason << "\r"; + Kernel::ProcessScheduler::The().Leak().TheCurrent().Leak().Exit(rdxEi->fCode); }; - kSyscalls[cLastExitInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { + kSyscalls[cLastExitInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { ProcessExitInfo* rdxEi = reinterpret_cast<ProcessExitInfo*>(rdx); if (!rdxEi) return; - rdxEi->fCode = NewOS::rt_get_exit_code(); + rdxEi->fCode = Kernel::rt_get_exit_code(); }; - kSyscalls[cRebootInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); + kSyscalls[cRebootInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); acpi.Reboot(); }; - kSyscalls[cShutdownInterrupt].Leak().Leak()->fProc = [](NewOS::VoidPtr rdx) -> void { - NewOS::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); + kSyscalls[cShutdownInterrupt].Leak().Leak()->fProc = [](Kernel::VoidPtr rdx) -> void { + Kernel::ACPIFactoryInterface acpi(kHandoverHeader->f_HardwareTables.f_RsdPtr); acpi.Shutdown(); }; @@ -206,7 +206,7 @@ EXTERN_C void hal_init_platform( kSyscalls[cRebootInterrupt].Leak().Leak()->fHooked = true; kSyscalls[cLPCSanitizeMsg].Leak().Leak()->fHooked = true; - NewOS::HAL::hal_system_get_cores(kHandoverHeader->f_HardwareTables.f_RsdPtr); + Kernel::HAL::hal_system_get_cores(kHandoverHeader->f_HardwareTables.f_RsdPtr); KERNEL_INIT(KeMain()); } diff --git a/Kernel/HALKit/AMD64/HalKernelMouse.cxx b/Kernel/HALKit/AMD64/HalKernelMouse.cxx index 71644d46..9cad6d35 100644 --- a/Kernel/HALKit/AMD64/HalKernelMouse.cxx +++ b/Kernel/HALKit/AMD64/HalKernelMouse.cxx @@ -11,17 +11,17 @@ #include <NewKit/Defines.hpp> /// @note forward decl. -EXTERN_C NewOS::Boolean _hal_draw_mouse(); -EXTERN_C NewOS::Void _hal_init_mouse(); - -STATIC NewOS::Int32 kPrevX = 10; -STATIC NewOS::Int32 kPrevY = 10; -STATIC NewOS::Int32 kX = 10; -STATIC NewOS::Int32 kY = 10; -STATIC NewOS::Int32 kMouseCycle = 0; -STATIC NewOS::PS2MouseInterface kMousePS2; -STATIC NewOS::Char kMousePacket[4] = {}; -STATIC NewOS::Boolean kMousePacketReady = false; +EXTERN_C Kernel::Boolean _hal_draw_mouse(); +EXTERN_C Kernel::Void _hal_init_mouse(); + +STATIC Kernel::Int32 kPrevX = 10; +STATIC Kernel::Int32 kPrevY = 10; +STATIC Kernel::Int32 kX = 10; +STATIC Kernel::Int32 kY = 10; +STATIC Kernel::Int32 kMouseCycle = 0; +STATIC Kernel::PS2MouseInterface kMousePS2; +STATIC Kernel::Char kMousePacket[4] = {}; +STATIC Kernel::Boolean kMousePacketReady = false; STATIC GXInit(); @@ -33,11 +33,11 @@ STATIC GXInit(); #define kPS2XOverflow 0b01000000 #define kPS2YOverflow 0b10000000 -using namespace NewOS; +using namespace Kernel; Void hal_handle_mouse() { - NewOS::UInt8 data = HAL::In8(0x60); + Kernel::UInt8 data = HAL::In8(0x60); switch (kMouseCycle) { @@ -66,8 +66,8 @@ Void hal_handle_mouse() // Notify PIC controller that we're done with it's interrupt. - NewOS::HAL::Out8(0x20, 0x20); - NewOS::HAL::Out8(0xA0, 0x20); + Kernel::HAL::Out8(0x20, 0x20); + Kernel::HAL::Out8(0xA0, 0x20); } /// @brief Interrupt handler for the mouse. diff --git a/Kernel/HALKit/AMD64/HalNewBoot.asm b/Kernel/HALKit/AMD64/HalNewBoot.asm index 3de6f38c..5f0342a3 100644 --- a/Kernel/HALKit/AMD64/HalNewBoot.asm +++ b/Kernel/HALKit/AMD64/HalNewBoot.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/HalPageAlloc.hpp b/Kernel/HALKit/AMD64/HalPageAlloc.hpp index bda7d902..55193686 100644 --- a/Kernel/HALKit/AMD64/HalPageAlloc.hpp +++ b/Kernel/HALKit/AMD64/HalPageAlloc.hpp @@ -27,14 +27,14 @@ #endif // !kPTESize EXTERN_C void hal_flush_tlb(); -EXTERN_C void hal_write_cr3(NewOS::UIntPtr pde); -EXTERN_C void hal_write_cr0(NewOS::UIntPtr bit); +EXTERN_C void hal_write_cr3(Kernel::UIntPtr pde); +EXTERN_C void hal_write_cr0(Kernel::UIntPtr bit); -EXTERN_C NewOS::UIntPtr hal_read_cr0(); // @brief CPU control register. -EXTERN_C NewOS::UIntPtr hal_read_cr2(); // @brief Fault address. -EXTERN_C NewOS::UIntPtr hal_read_cr3(); // @brief Page table. +EXTERN_C Kernel::UIntPtr hal_read_cr0(); // @brief CPU control register. +EXTERN_C Kernel::UIntPtr hal_read_cr2(); // @brief Fault address. +EXTERN_C Kernel::UIntPtr hal_read_cr3(); // @brief Page table. -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED PageTable64 final { @@ -44,9 +44,9 @@ namespace NewOS::HAL bool Wt : 1; bool Cache : 1; bool Accessed : 1; - NewOS::Int32 Reserved : 6; - NewOS::UInt64 PhysicalAddress : 36; - NewOS::Int32 Reserved1 : 15; + Kernel::Int32 Reserved : 6; + Kernel::UInt64 PhysicalAddress : 36; + Kernel::Int32 Reserved1 : 15; bool ExecDisable : 1; }; @@ -79,10 +79,10 @@ namespace NewOS::HAL }; VoidPtr hal_alloc_page(Boolean rw, Boolean user, SizeT size); -} // namespace NewOS::HAL +} // namespace Kernel::HAL -namespace NewOS +namespace Kernel { typedef HAL::PageTable64 PTE; typedef HAL::PageDirectory64 PDE; -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalProcessor.cpp b/Kernel/HALKit/AMD64/HalProcessor.cpp index 0aa69dae..01f3879a 100644 --- a/Kernel/HALKit/AMD64/HalProcessor.cpp +++ b/Kernel/HALKit/AMD64/HalProcessor.cpp @@ -11,7 +11,7 @@ * @brief This file is about processor specific functions (in/out/cli/std...) */ -namespace NewOS::HAL +namespace Kernel::HAL { void Out8(UInt16 port, UInt8 value) { @@ -94,4 +94,4 @@ namespace NewOS::HAL { asm volatile("std"); } -} // namespace NewOS::HAL +} // namespace Kernel::HAL diff --git a/Kernel/HALKit/AMD64/HalSMPCore.cxx b/Kernel/HALKit/AMD64/HalSMPCore.cxx index 34061b09..4cb87542 100644 --- a/Kernel/HALKit/AMD64/HalSMPCore.cxx +++ b/Kernel/HALKit/AMD64/HalSMPCore.cxx @@ -6,7 +6,7 @@ #include <KernelKit/ProcessScheduler.hxx> -using namespace NewOS; +using namespace Kernel; Void ProcessHeader::SetEntrypoint(UIntPtr& imageStart) noexcept { if (imageStart == 0) @@ -16,7 +16,7 @@ Void ProcessHeader::SetEntrypoint(UIntPtr& imageStart) noexcept this->StackFrame->Rsp = this->StackFrame->Rbp; } -namespace NewOS +namespace Kernel { bool rt_check_stack(HAL::StackFramePtr stackPtr) { @@ -27,4 +27,4 @@ namespace NewOS return true; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/HalSMPCoreManager.asm b/Kernel/HALKit/AMD64/HalSMPCoreManager.asm index 320120a4..7b0926bb 100644 --- a/Kernel/HALKit/AMD64/HalSMPCoreManager.asm +++ b/Kernel/HALKit/AMD64/HalSMPCoreManager.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * NewOS +;; * Kernel ;; * Copyright Zeta Electronics Corporation, all rights reserved. ;; * ;; * ======================================================== diff --git a/Kernel/HALKit/AMD64/Hypervisor.hpp b/Kernel/HALKit/AMD64/Hypervisor.hpp index 05e127c2..1ab69ef4 100644 --- a/Kernel/HALKit/AMD64/Hypervisor.hpp +++ b/Kernel/HALKit/AMD64/Hypervisor.hpp @@ -8,7 +8,7 @@ #include <NewKit/Defines.hpp> -namespace NewOS +namespace Kernel { MAKE_STRING_ENUM(HYPERVISOR) ENUM_STRING(Qemu, "TCGTCGTCGTCG"); @@ -23,4 +23,4 @@ namespace NewOS ENUM_STRING(Qnx, " QNXQVMBSQG "); END_STRING_ENUM() -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/PCI/Database.cxx b/Kernel/HALKit/AMD64/PCI/Database.cxx index 631ed79f..65ec307e 100644 --- a/Kernel/HALKit/AMD64/PCI/Database.cxx +++ b/Kernel/HALKit/AMD64/PCI/Database.cxx @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Database.hpp> -namespace NewOS +namespace Kernel { } diff --git a/Kernel/HALKit/AMD64/PCI/Device.cxx b/Kernel/HALKit/AMD64/PCI/Device.cxx index 9e18581d..c1fdc401 100644 --- a/Kernel/HALKit/AMD64/PCI/Device.cxx +++ b/Kernel/HALKit/AMD64/PCI/Device.cxx @@ -7,29 +7,29 @@ #include <ArchKit/ArchKit.hpp> #include <KernelKit/PCI/Device.hpp> -NewOS::UInt NewOSPCIReadRaw(NewOS::UInt bar, NewOS::UShort bus, NewOS::UShort dev, NewOS::UShort fun) +Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NewOS::UInt target = 0x80000000 | ((NewOS::UInt)bus << 16) | - ((NewOS::UInt)dev << 11) | ((NewOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NewOS::HAL::Out32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - return NewOS::HAL::In32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigData); + return Kernel::HAL::In32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); } -void NewOSPCISetCfgTarget(NewOS::UInt bar, NewOS::UShort bus, NewOS::UShort dev, NewOS::UShort fun) +void NewOSPCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NewOS::UInt target = 0x80000000 | ((NewOS::UInt)bus << 16) | - ((NewOS::UInt)dev << 11) | ((NewOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & ~3); - NewOS::HAL::Out32((NewOS::UShort)NewOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::Out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); } -namespace NewOS::PCI +namespace Kernel::PCI { Device::Device(UShort bus, UShort device, UShort func, UShort bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -127,4 +127,4 @@ namespace NewOS::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace NewOS::PCI +} // namespace Kernel::PCI diff --git a/Kernel/HALKit/AMD64/PCI/Dma.cxx b/Kernel/HALKit/AMD64/PCI/Dma.cxx index e58ea175..3e6319e3 100644 --- a/Kernel/HALKit/AMD64/PCI/Dma.cxx +++ b/Kernel/HALKit/AMD64/PCI/Dma.cxx @@ -6,7 +6,7 @@ #include <KernelKit/PCI/Dma.hpp> -namespace NewOS +namespace Kernel { DMAWrapper::operator bool() { @@ -79,4 +79,4 @@ namespace NewOS fAddress = Ptr; return *this; } -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/AMD64/PCI/Express.cxx b/Kernel/HALKit/AMD64/PCI/Express.cxx index daa3f0ba..2b88f312 100644 --- a/Kernel/HALKit/AMD64/PCI/Express.cxx +++ b/Kernel/HALKit/AMD64/PCI/Express.cxx @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Express.hpp> -namespace NewOS +namespace Kernel { } diff --git a/Kernel/HALKit/AMD64/PCI/Iterator.cxx b/Kernel/HALKit/AMD64/PCI/Iterator.cxx index d3167b46..0f766111 100644 --- a/Kernel/HALKit/AMD64/PCI/Iterator.cxx +++ b/Kernel/HALKit/AMD64/PCI/Iterator.cxx @@ -10,7 +10,7 @@ if (DEV.Leak().Leak()) \ return *DEV.Leak().Leak(); -namespace NewOS::PCI +namespace Kernel::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -41,4 +41,4 @@ namespace NewOS::PCI PCI_ITERATOR_FIND_AND_UNWRAP(fDevices[sz], sz); return {}; } -} // namespace NewOS::PCI +} // namespace Kernel::PCI diff --git a/Kernel/HALKit/AMD64/Processor.hpp b/Kernel/HALKit/AMD64/Processor.hpp index d39a7984..756c5770 100644 --- a/Kernel/HALKit/AMD64/Processor.hpp +++ b/Kernel/HALKit/AMD64/Processor.hpp @@ -34,7 +34,7 @@ #define kGdtCodeSelector (0x08) #define cHeapStartOffset (0x10000000) -namespace NewOS +namespace Kernel { namespace Detail::AMD64 { @@ -50,9 +50,9 @@ namespace NewOS UInt32 Zero; // reserved }; } // namespace Detail::AMD64 -} // namespace NewOS +} // namespace Kernel -namespace NewOS::HAL +namespace Kernel::HAL { /// @brief Virtual memory flags. enum @@ -259,21 +259,21 @@ namespace NewOS::HAL NewOSGDTRecord UserData; }; } // namespace Detail -} // namespace NewOS::HAL +} // namespace Kernel::HAL -EXTERN_C void idt_handle_generic(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_gpf(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_math(NewOS::UIntPtr rsp); -EXTERN_C void idt_handle_pf(NewOS::UIntPtr rsp); +EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp); +EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp); -EXTERN_C void hal_load_idt(NewOS::HAL::Register64 ptr); -EXTERN_C void hal_load_gdt(NewOS::HAL::RegisterGDT ptr); +EXTERN_C void hal_load_idt(Kernel::HAL::Register64 ptr); +EXTERN_C void hal_load_gdt(Kernel::HAL::RegisterGDT ptr); /// @brief Maximum size of the IDT. #define kKernelIdtSize 0x100 #define kKernelInterruptId 0x32 -inline NewOS::VoidPtr kKernelVirtualStart = (NewOS::VoidPtr)cHeapStartOffset; -inline NewOS::UIntPtr kKernelVirtualSize = 0UL; +inline Kernel::VoidPtr kKernelVirtualStart = (Kernel::VoidPtr)cHeapStartOffset; +inline Kernel::UIntPtr kKernelVirtualSize = 0UL; -inline NewOS::VoidPtr kKernelPhysicalStart = nullptr; +inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; diff --git a/Kernel/HALKit/AMD64/Storage/AHCI.cxx b/Kernel/HALKit/AMD64/Storage/AHCI.cxx index 8555b3de..51153417 100644 --- a/Kernel/HALKit/AMD64/Storage/AHCI.cxx +++ b/Kernel/HALKit/AMD64/Storage/AHCI.cxx @@ -25,14 +25,14 @@ enum kSATASubClass = 0x06 }; -static NewOS::PCI::Device kAhciDevice; +static Kernel::PCI::Device kAhciDevice; /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of port that have been detected. /// @return -NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented) +Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) { - using namespace NewOS; + using namespace Kernel; PCI::Iterator iterator(Types::PciDeviceKind::MassStorageController); for (SizeT devIndex = 0; devIndex < NEWOS_BUS_COUNT; ++devIndex) @@ -52,16 +52,16 @@ NewOS::Boolean drv_std_init(NewOS::UInt16& PortsImplemented) return false; } -NewOS::Boolean drv_std_detected(NewOS::Void) +Kernel::Boolean drv_std_detected(Kernel::Void) { return kAhciDevice.DeviceId() != 0xFFFF; } -NewOS::Void drv_std_read(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size) +Kernel::Void drv_std_read(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size) { } -NewOS::Void drv_std_write(NewOS::UInt64 Lba, NewOS::Char* Buf, NewOS::SizeT SectorSz, NewOS::SizeT Size) +Kernel::Void drv_std_write(Kernel::UInt64 Lba, Kernel::Char* Buf, Kernel::SizeT SectorSz, Kernel::SizeT Size) { } #endif // __AHCI__ diff --git a/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx b/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx index b6dacf21..33e6bc31 100644 --- a/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx +++ b/Kernel/HALKit/AMD64/Storage/ATA-DMA.cxx @@ -20,7 +20,7 @@ #include <Modules/ATA/ATA.hxx> #include <ArchKit/ArchKit.hpp> -using namespace NewOS; +using namespace Kernel; EXTERN_C Int32 kPRDTTransferStatus; STATIC PRDT kPRDT; diff --git a/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx b/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx index 7853d497..1a8e78c3 100644 --- a/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx +++ b/Kernel/HALKit/AMD64/Storage/ATA-PIO.cxx @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace NewOS; -using namespace NewOS::HAL; +using namespace Kernel; +using namespace Kernel::HAL; /// bugs: 0 @@ -178,13 +178,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -NewOS::SizeT drv_std_get_sector_count() +Kernel::SizeT drv_std_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -NewOS::SizeT drv_std_get_drv_size() +Kernel::SizeT drv_std_get_drv_size() { return drv_std_get_sector_count() * kATASectorSize; } diff --git a/Kernel/HALKit/ARM64/HalPageAlloc.hpp b/Kernel/HALKit/ARM64/HalPageAlloc.hpp index fbdbfea8..8286b5cd 100644 --- a/Kernel/HALKit/ARM64/HalPageAlloc.hpp +++ b/Kernel/HALKit/ARM64/HalPageAlloc.hpp @@ -56,7 +56,7 @@ M, N \ } -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED LongDescLevel3 final { @@ -97,12 +97,12 @@ namespace NewOS::HAL }; VoidPtr hal_alloc_page(Boolean rw, Boolean user, SizeT size); -} // namespace NewOS::HAL +} // namespace Kernel::HAL -namespace NewOS +namespace Kernel { typedef HAL::LongDescLevel3 PTE; typedef HAL::PageDirectory64 PDE; -} // namespace NewOS +} // namespace Kernel EXTERN_C void hal_flush_tlb(); diff --git a/Kernel/HALKit/ARM64/Processor.hxx b/Kernel/HALKit/ARM64/Processor.hxx index d9a86270..631ecdf0 100644 --- a/Kernel/HALKit/ARM64/Processor.hxx +++ b/Kernel/HALKit/ARM64/Processor.hxx @@ -25,7 +25,7 @@ #error !!! please provide that macro. !!! #endif -namespace NewOS::HAL +namespace Kernel::HAL { struct PACKED Register64 final { @@ -45,11 +45,11 @@ namespace NewOS::HAL }; typedef StackFrame* StackFramePtr; -} // namespace NewOS::HAL +} // namespace Kernel::HAL -inline NewOS::VoidPtr kKernelVirtualStart = (NewOS::VoidPtr)cHeapStartOffset; -inline NewOS::UIntPtr kKernelVirtualSize = 0UL; +inline Kernel::VoidPtr kKernelVirtualStart = (Kernel::VoidPtr)cHeapStartOffset; +inline Kernel::UIntPtr kKernelVirtualSize = 0UL; -inline NewOS::VoidPtr kKernelPhysicalStart = nullptr; +inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; #include <HALKit/ARM64/HalPageAlloc.hpp> diff --git a/Kernel/HALKit/ARM64/Storage/HalFlash.cxx b/Kernel/HALKit/ARM64/Storage/HalFlash.cxx index 4466963e..20c2836d 100644 --- a/Kernel/HALKit/ARM64/Storage/HalFlash.cxx +++ b/Kernel/HALKit/ARM64/Storage/HalFlash.cxx @@ -14,7 +14,7 @@ #define cMaxFlash (4U) -namespace NewOS +namespace Kernel { /// /:\\BRIDGE\\FLSH\\1 constexpr auto cFlashBridgeMagic = "FLSH"; @@ -61,6 +61,6 @@ namespace NewOS { kcout << "newoskrnl: disabled hardware.\r"; } -} // namespace NewOS +} // namespace Kernel #endif // if __FLASH_MEM__ (Bridge) diff --git a/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp index f308b0b5..4469eee9 100644 --- a/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp +++ b/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp @@ -10,15 +10,15 @@ /// @brief Internal call for syscall, to work with C++. /// @param stack /// @return nothing. -EXTERN_C void rt_syscall_handle(NewOS::HAL::StackFrame* stack) +EXTERN_C void rt_syscall_handle(Kernel::HAL::StackFrame* stack) { if (stack->Rcx <= (kSyscalls.Count() - 1)) { - NewOS::kcout << "newoskrnl: syscall: enter.\r"; + Kernel::kcout << "newoskrnl: syscall: enter.\r"; if (kSyscalls[stack->Rcx].Leak().Leak().fHooked) (kSyscalls[stack->Rcx].Leak().Leak().fProc)(stack); - NewOS::kcout << "newoskrnl: syscall: exit.\r"; + Kernel::kcout << "newoskrnl: syscall: exit.\r"; } } diff --git a/Kernel/HALKit/POWER/HalHardware.cxx b/Kernel/HALKit/POWER/HalHardware.cxx index 8dd0205c..15407eb3 100644 --- a/Kernel/HALKit/POWER/HalHardware.cxx +++ b/Kernel/HALKit/POWER/HalHardware.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -namespace NewOS +namespace Kernel { namespace HAL { @@ -16,4 +16,4 @@ namespace NewOS return 0; } } // namespace HAL -} // namespace NewOS +} // namespace Kernel diff --git a/Kernel/HALKit/POWER/HalHart.cxx b/Kernel/HALKit/POWER/HalHart.cxx index 16a26a3a..614828cb 100644 --- a/Kernel/HALKit/POWER/HalHart.cxx +++ b/Kernel/HALKit/POWER/HalHart.cxx @@ -8,7 +8,7 @@ #include <KernelKit/DebugOutput.hpp> #include <HALKit/POWER/Hart.hxx> -using namespace NewOS; +using namespace Kernel; /// @brief wakes up thread. /// wakes up thread from hang. diff --git a/Kernel/HALKit/POWER/HalSerialPort.cxx b/Kernel/HALKit/POWER/HalSerialPort.cxx index 86388b4c..abddd291 100644 --- a/Kernel/HALKit/POWER/HalSerialPort.cxx +++ b/Kernel/HALKit/POWER/HalSerialPort.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -using namespace NewOS; +using namespace Kernel; /// @brief Writes to COM1. /// @param bytes diff --git a/Kernel/HALKit/POWER/HalThread.cxx b/Kernel/HALKit/POWER/HalThread.cxx index 83f03373..18d84d4f 100644 --- a/Kernel/HALKit/POWER/HalThread.cxx +++ b/Kernel/HALKit/POWER/HalThread.cxx @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.hpp> #include <KernelKit/DebugOutput.hpp> -EXTERN_C NewOS::HAL::StackFramePtr rt_get_current_context() +EXTERN_C Kernel::HAL::StackFramePtr rt_get_current_context() { return nullptr; } diff --git a/Kernel/HALKit/POWER/HalVirtualMemory.cxx b/Kernel/HALKit/POWER/HalVirtualMemory.cxx index a49ba63f..eb04a43d 100644 --- a/Kernel/HALKit/POWER/HalVirtualMemory.cxx +++ b/Kernel/HALKit/POWER/HalVirtualMemory.cxx @@ -12,7 +12,7 @@ /// @note refer to our SoC documentation. -using namespace NewOS; +using namespace Kernel; /// @brief Write directly to the specific TLB. /// @param mas0 diff --git a/Kernel/HALKit/POWER/Hart.hxx b/Kernel/HALKit/POWER/Hart.hxx index ab74be4a..8f466098 100644 --- a/Kernel/HALKit/POWER/Hart.hxx +++ b/Kernel/HALKit/POWER/Hart.hxx @@ -16,14 +16,14 @@ #include <NewKit/Defines.hpp> /// @brief hardware thread indentification type. -typedef NewOS::Int32 PPCHartType; +typedef Kernel::Int32 PPCHartType; /// @brief Hardware thread information structure. typedef struct HalHardwareThread { - NewOS::UIntPtr fStartAddress; - NewOS::UInt8 fPrivleged : 1; - NewOS::UInt32 fPageFlags; + Kernel::UIntPtr fStartAddress; + Kernel::UInt8 fPrivleged : 1; + Kernel::UInt32 fPageFlags; PPCHartType fIdentNumber; } HalHardwareThread; @@ -31,4 +31,4 @@ typedef struct HalHardwareThread /// @param hart the hart /// @param epc the pc. /// @return -EXTERN_C NewOS::Void hal_set_pc_to_hart(HalHardwareThread* hart, NewOS::VoidPtr epc); +EXTERN_C Kernel::Void hal_set_pc_to_hart(HalHardwareThread* hart, Kernel::VoidPtr epc); diff --git a/Kernel/HALKit/POWER/Processor.hpp b/Kernel/HALKit/POWER/Processor.hpp index af00b7af..5ff7eef3 100644 --- a/Kernel/HALKit/POWER/Processor.hpp +++ b/Kernel/HALKit/POWER/Processor.hpp @@ -13,7 +13,7 @@ #define kHalPPCAlignment __attribute__((aligned(4))) -namespace NewOS::HAL +namespace Kernel::HAL { typedef UIntPtr Reg; @@ -46,10 +46,10 @@ namespace NewOS::HAL { asm volatile("mr 0, 0"); // no oop } -} // namespace NewOS::HAL +} // namespace Kernel::HAL -EXTERN_C void int_handle_math(NewOS::UIntPtr sp); -EXTERN_C void int_handle_pf(NewOS::UIntPtr sp); +EXTERN_C void int_handle_math(Kernel::UIntPtr sp); +EXTERN_C void int_handle_pf(Kernel::UIntPtr sp); /// @brief Flush system TLB. EXTERN_C void hal_flush_tlb(); diff --git a/Kernel/HALKit/RISCV/Hart.hxx b/Kernel/HALKit/RISCV/Hart.hxx index 38160322..92cc286e 100644 --- a/Kernel/HALKit/RISCV/Hart.hxx +++ b/Kernel/HALKit/RISCV/Hart.hxx @@ -15,10 +15,10 @@ #include <NewKit/Defines.hpp> -typedef NewOS::Int32 Rv64HartType; +typedef Kernel::Int32 Rv64HartType; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return -EXTERN_C NewOS::Void hal_set_pc_to_hart(Rv64HartType hart, NewOS::VoidPtr epc); +EXTERN_C Kernel::Void hal_set_pc_to_hart(Rv64HartType hart, Kernel::VoidPtr epc); |
