diff options
| author | Amlal <amlal.elmahrouss@icloud.com> | 2025-02-20 12:32:38 +0100 |
|---|---|---|
| committer | Amlal <amlal.elmahrouss@icloud.com> | 2025-02-20 12:38:04 +0100 |
| commit | 7d2a7e7cab23b8217498866615a3719e5d3980ee (patch) | |
| tree | 75b87af3d8be10f29f2d5c69af17a9455c90df73 /dev/Kernel/HALKit | |
| parent | aa8a096ad429640e752d69a89c572da35493d4c0 (diff) | |
NeOS: Namespace change from 'Kernel' to 'NeOS'
ADD: Start defining the Workstation's HPFS (High-Performance File System)
Signed-off-by: Amlal <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Kernel/HALKit')
46 files changed, 282 insertions, 282 deletions
diff --git a/dev/Kernel/HALKit/AMD64/CPUID.h b/dev/Kernel/HALKit/AMD64/CPUID.h index 59a14330..7f04ac27 100644 --- a/dev/Kernel/HALKit/AMD64/CPUID.h +++ b/dev/Kernel/HALKit/AMD64/CPUID.h @@ -80,7 +80,7 @@ enum CPUFeatureEnum kCPUFeaturePBE = 1 << 31 }; -namespace Kernel +namespace NeOS { typedef Int64 CPUID; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc index 33842d6c..27dfddaa 100644 --- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc @@ -10,7 +10,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/MemoryMgr.h> -namespace Kernel +namespace NeOS { namespace Detail { @@ -123,4 +123,4 @@ namespace Kernel "jmp reset_wait ; " ".att_syntax; "); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalAPICController.cc b/dev/Kernel/HALKit/AMD64/HalAPICController.cc index c3ce5c1a..bd98932f 100644 --- a/dev/Kernel/HALKit/AMD64/HalAPICController.cc +++ b/dev/Kernel/HALKit/AMD64/HalAPICController.cc @@ -10,7 +10,7 @@ #define cIOAPICRegVal (4) #define cIOAPICRegReg (0) -namespace Kernel::HAL +namespace NeOS::HAL { APICController::APICController(VoidPtr base) : fApic(base) @@ -41,4 +41,4 @@ namespace Kernel::HAL io_apic[cIOAPICRegReg] = (reg & 0xFF); io_apic[cIOAPICRegVal] = value; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc index 627f3fcb..c847f2b9 100644 --- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -34,7 +34,7 @@ /////////////////////////////////////////////////////////////////////////////////////// -namespace Kernel::HAL +namespace NeOS::HAL { struct PROCESS_APIC_MADT; struct PROCESS_CONTROL_BLOCK; @@ -120,10 +120,10 @@ namespace Kernel::HAL Void hal_send_start_ipi(UInt32 target, UInt32 apic_id) { - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000500 | 0x00004000 | 0x00000000); - while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { ; } @@ -138,10 +138,10 @@ namespace Kernel::HAL /***********************************************************************************/ Void hal_send_sipi(UInt32 target, UInt32 apic_id, UInt8 vector) { - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); - Kernel::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_High, apic_id << 24); + NeOS::ke_dma_write<UInt32>(target, kAPIC_ICR_Low, 0x00000600 | 0x00004000 | 0x00000000 | vector); - while (Kernel::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) + while (NeOS::ke_dma_read<UInt32>(target, kAPIC_ICR_Low) & 0x1000) { NE_UNUSED(0); } @@ -241,7 +241,7 @@ namespace Kernel::HAL hal_send_start_ipi(kApicBaseAddress, kAPICLocales[kSMPCount]); - HardwareTimer timer(Kernel::Milliseconds(10)); + HardwareTimer timer(NeOS::Milliseconds(10)); timer.Wait(); /// TODO: HAL helper to create an address. @@ -268,6 +268,6 @@ namespace Kernel::HAL /// TODO: Notify Boot AP that it must start. } } -} // namespace Kernel::HAL +} // namespace NeOS::HAL /////////////////////////////////////////////////////////////////////////////////////// diff --git a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc index ef1ce21f..3d9c8938 100644 --- a/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc @@ -13,11 +13,11 @@ STATIC BOOL kIsScheduling = NO; /// @brief Handle GPF fault. /// @param rsp -EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_gpf(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -30,18 +30,18 @@ EXTERN_C void idt_handle_gpf(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle page fault. /// @param rsp -EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_pf(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -53,15 +53,15 @@ EXTERN_C void idt_handle_pf(Kernel::UIntPtr rsp) process.Leak().ProcessSignal.SignalID = SIGKILL; process.Leak().ProcessSignal.PreviousStatus = process.Leak().Status; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } /// @brief Handle scheduler interrupt. -EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_scheduler(NeOS::UIntPtr rsp) { - static Kernel::Int64 try_count_before_brute = 100000UL; + static NeOS::Int64 try_count_before_brute = 100000UL; while (kIsScheduling) { @@ -75,18 +75,18 @@ EXTERN_C void idt_handle_scheduler(Kernel::UIntPtr rsp) kIsScheduling = YES; kout << "Kernel: Timer IRQ (Scheduler Notification).\r"; - Kernel::UserProcessHelper::StartScheduling(); + NeOS::UserProcessHelper::StartScheduling(); kIsScheduling = NO; } /// @brief Handle math fault. /// @param rsp -EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_math(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -99,7 +99,7 @@ EXTERN_C void idt_handle_math(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } @@ -108,11 +108,11 @@ EXTERN BOOL kAHCICommandIssued; /// @brief Handle any generic fault. /// @param rsp -EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_generic(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) { kout << "Getting here.\r"; return; @@ -128,16 +128,16 @@ EXTERN_C void idt_handle_generic(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } -EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) +EXTERN_C NeOS::Void idt_handle_breakpoint(NeOS::UIntPtr rip) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) { kout << "Kernel: SIGTRAP\r"; @@ -147,7 +147,7 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) kIsScheduling = NO; - kout << "Kernel: Process RIP: " << Kernel::hex_number(rip) << endl; + kout << "Kernel: Process RIP: " << NeOS::hex_number(rip) << endl; kout << "Kernel: SIGTRAP\r"; process.Leak().ProcessSignal.SignalArg = rip; @@ -157,16 +157,16 @@ EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip) kout << "Kernel: SIGTRAP status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kFrozen; + process.Leak().Status = NeOS::ProcessStatusKind::kFrozen; } /// @brief Handle #UD fault. /// @param rsp -EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) +EXTERN_C void idt_handle_ud(NeOS::UIntPtr rsp) { - auto process = Kernel::UserProcessScheduler::The().CurrentProcess(); + auto process = NeOS::UserProcessScheduler::The().CurrentProcess(); - if (process.Leak().Status != Kernel::ProcessStatusKind::kRunning) + if (process.Leak().Status != NeOS::ProcessStatusKind::kRunning) return; kIsScheduling = NO; @@ -179,7 +179,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) kout << "Kernel: SIGKILL status.\r"; - process.Leak().Status = Kernel::ProcessStatusKind::kKilled; + process.Leak().Status = NeOS::ProcessStatusKind::kKilled; process.Leak().Crash(); } @@ -187,7 +187,7 @@ EXTERN_C void idt_handle_ud(Kernel::UIntPtr rsp) /// @brief Enter syscall from assembly. /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, Kernel::UIntPtr rdx_syscall_struct) +EXTERN_C NeOS::Void hal_system_call_enter(NeOS::UIntPtr rcx_syscall_index, NeOS::UIntPtr rdx_syscall_struct) { if (rcx_syscall_index < kSyscalls.Count()) { @@ -197,7 +197,7 @@ EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, K { if (kSyscalls[rcx_syscall_index].fProc) { - (kSyscalls[rcx_syscall_index].fProc)((Kernel::VoidPtr)rdx_syscall_struct); + (kSyscalls[rcx_syscall_index].fProc)((NeOS::VoidPtr)rdx_syscall_struct); } else { @@ -216,7 +216,7 @@ EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, K /// @brief Enter Kernel call from assembly (DDK only). /// @param stack the stack pushed from assembly routine. /// @return nothing. -EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, Kernel::UIntPtr rdx_kerncall_struct) +EXTERN_C NeOS::Void hal_kernel_call_enter(NeOS::UIntPtr rcx_kerncall_index, NeOS::UIntPtr rdx_kerncall_struct) { if (rcx_kerncall_index < kKerncalls.Count()) { @@ -226,7 +226,7 @@ EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, { if (kKerncalls[rcx_kerncall_index].fProc) { - (kKerncalls[rcx_kerncall_index].fProc)((Kernel::VoidPtr)rdx_kerncall_struct); + (kKerncalls[rcx_kerncall_index].fProc)((NeOS::VoidPtr)rdx_kerncall_struct); } else { diff --git a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc index a51a1e15..dfdf52f1 100644 --- a/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/AMD64/HalDebugOutput.cc @@ -11,7 +11,7 @@ #include <Mod/CoreGfx/FBMgr.h> #include <Mod/CoreGfx/TextMgr.h> -namespace Kernel +namespace NeOS { enum CommStatus { @@ -183,8 +183,8 @@ namespace Kernel TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); + TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); return out; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc b/dev/Kernel/HALKit/AMD64/HalDebugPort.cc index 5e6f60a6..f88b1a70 100644 --- a/dev/Kernel/HALKit/AMD64/HalDebugPort.cc +++ b/dev/Kernel/HALKit/AMD64/HalDebugPort.cc @@ -12,7 +12,7 @@ // after that we have start of additional data. -namespace Kernel +namespace NeOS { void rt_debug_listen(DebuggerPortHeader* theHook) noexcept { @@ -37,4 +37,4 @@ namespace Kernel ++theHook->fBoundCnt; } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc b/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc index a83ed2e5..154b11af 100644 --- a/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc +++ b/dev/Kernel/HALKit/AMD64/HalDescriptorLoader.cc @@ -9,11 +9,11 @@ #define kPITDefaultTicks (1000U) -namespace Kernel::HAL +namespace NeOS::HAL { namespace Detail { - STATIC ::Kernel::Detail::AMD64::InterruptDescriptorAMD64 + STATIC ::NeOS::Detail::AMD64::InterruptDescriptorAMD64 kInterruptVectorTable[kKernelIdtSize] = {}; STATIC void hal_set_irq_mask(UInt8 irql); @@ -88,7 +88,7 @@ namespace Kernel::HAL const Int16 kPITTickForScheduler = kPITDefaultTicks; - volatile ::Kernel::UIntPtr** ptr_ivt = (volatile ::Kernel::UIntPtr**)idt.Base; + volatile ::NeOS::UIntPtr** ptr_ivt = (volatile ::NeOS::UIntPtr**)idt.Base; for (SizeT idt_indx = 0; idt_indx < kKernelIdtSize; ++idt_indx) { @@ -104,7 +104,7 @@ namespace Kernel::HAL } idt.Base = (UIntPtr)&Detail::kInterruptVectorTable[0]; - idt.Limit = sizeof(::Kernel::Detail::AMD64::InterruptDescriptorAMD64) * + idt.Limit = sizeof(::NeOS::Detail::AMD64::InterruptDescriptorAMD64) * (kKernelIdtSize); hal_load_idt(idt); @@ -123,4 +123,4 @@ namespace Kernel::HAL { IDTLoader::Load(idt.Leak()); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc index a15a6984..bdc09bcf 100644 --- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc @@ -13,35 +13,35 @@ #include <CFKit/Property.h> #include <Mod/CoreGfx/TextMgr.h> -EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; -EXTERN_C Kernel::VoidPtr mp_user_switch_proc; -EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; +EXTERN_C NeOS::VoidPtr kInterruptVectorTable[]; +EXTERN_C NeOS::VoidPtr mp_user_switch_proc; +EXTERN_C NeOS::Char mp_user_switch_proc_stack_begin[]; -EXTERN_C Kernel::rtl_ctor_kind __CTOR_LIST__[]; -EXTERN_C Kernel::VoidPtr __DTOR_LIST__; +EXTERN_C NeOS::rtl_ctor_kind __CTOR_LIST__[]; +EXTERN_C NeOS::VoidPtr __DTOR_LIST__; -EXTERN_C Kernel::Void rtl_kernel_main(Kernel::SizeT argc, char** argv, char** envp, Kernel::SizeT envp_len); +EXTERN_C NeOS::Void rtl_kernel_main(NeOS::SizeT argc, char** argv, char** envp, NeOS::SizeT envp_len); -STATIC Kernel::Void hal_init_cxx_ctors() +STATIC NeOS::Void hal_init_cxx_ctors() { - for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) + for (NeOS::SizeT i = 0U; i < NeOS::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) { - Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); - Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled; + NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = NeOS::UserProcess(); + NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = NeOS::ProcessStatusKind::kKilled; } - Kernel::UserProcessScheduler::The().CurrentTeam().mProcessCount = 0UL; + NeOS::UserProcessScheduler::The().CurrentTeam().mProcessCount = 0UL; - for (Kernel::SizeT index = 0UL; __CTOR_LIST__[index] != __DTOR_LIST__; ++index) + for (NeOS::SizeT index = 0UL; __CTOR_LIST__[index] != __DTOR_LIST__; ++index) { - Kernel::rtl_ctor_kind constructor_cxx = (Kernel::rtl_ctor_kind)__CTOR_LIST__[index]; + NeOS::rtl_ctor_kind constructor_cxx = (NeOS::rtl_ctor_kind)__CTOR_LIST__[index]; constructor_cxx(); } } /// @brief Kernel init procedure. EXTERN_C void hal_init_platform( - Kernel::HEL::BootInfoHeader* handover_hdr) + NeOS::HEL::BootInfoHeader* handover_hdr) { kHandoverHeader = handover_hdr; @@ -58,8 +58,8 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( - reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( + reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); /************************************** */ /* INITIALIZE GDT AND SEGMENTS. */ @@ -68,7 +68,7 @@ EXTERN_C void hal_init_platform( STATIC CONST auto kGDTEntriesCount = 6; /* GDT, mostly descriptors for user and kernel segments. */ - STATIC Kernel::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { + STATIC NeOS::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { {.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0}, // Null entry {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data @@ -77,31 +77,31 @@ EXTERN_C void hal_init_platform( }; // Load memory descriptors. - Kernel::HAL::RegisterGDT gdt_reg; + NeOS::HAL::RegisterGDT gdt_reg; - gdt_reg.Base = reinterpret_cast<Kernel::UIntPtr>(kGDTArray); - gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; + gdt_reg.Base = reinterpret_cast<NeOS::UIntPtr>(kGDTArray); + gdt_reg.Limit = (sizeof(NeOS::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; FB::fb_clear_video(); //! GDT will load hal_read_init after it successfully loads the segments. - Kernel::HAL::GDTLoader gdt_loader; + NeOS::HAL::GDTLoader gdt_loader; gdt_loader.Load(gdt_reg); - Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP); + NeOS::ke_panic(RUNTIME_CHECK_BOOTSTRAP); } -EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept +EXTERN_C NeOS::Void hal_real_init(NeOS::Void) noexcept { rtl_kernel_main(0, nullptr, nullptr, 0); - Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); + NeOS::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - Kernel::HAL::Register64 idt_reg; + NeOS::HAL::Register64 idt_reg; - idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable; + idt_reg.Base = (NeOS::UIntPtr)kInterruptVectorTable; - Kernel::HAL::IDTLoader idt_loader; + NeOS::HAL::IDTLoader idt_loader; idt_loader.Load(idt_reg); diff --git a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc index 11ed4c04..df060648 100644 --- a/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc +++ b/dev/Kernel/HALKit/AMD64/HalKernelPanic.cc @@ -18,7 +18,7 @@ /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace Kernel +namespace NeOS { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace Kernel /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const Kernel::Int32& id, const Char* message) + Void ke_panic(const NeOS::Int32& id, const Char* message) { fb_init(); @@ -65,4 +65,4 @@ namespace Kernel ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc index 442e9b83..b5fa2b1d 100644 --- a/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalPagingMgrAMD64.cc @@ -10,7 +10,7 @@ #include <HALKit/AMD64/Paging.h> #include <HALKit/AMD64/Processor.h> -namespace Kernel::HAL +namespace NeOS::HAL { typedef UInt32 PageTableIndex; @@ -201,4 +201,4 @@ namespace Kernel::HAL return 0; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc b/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc index b3cf8d09..b3da8352 100644 --- a/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalProcessorAMD64.cc @@ -15,7 +15,7 @@ * @brief Common CPU API. */ -namespace Kernel::HAL +namespace NeOS::HAL { Void lrt_out8(UInt16 port, UInt8 value) { @@ -98,4 +98,4 @@ namespace Kernel::HAL { asm volatile("std"); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc b/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc index 6b287060..bf4b9d91 100644 --- a/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalSchedulerCorePrimitivesAMD64.cc @@ -7,7 +7,7 @@ #include <HALKit/AMD64/Processor.h> #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /***********************************************************************************/ /// @brief Unimplemented function (crashes by default) @@ -37,7 +37,7 @@ namespace Kernel /// Wakes up thread from the hang state. Void mp_wakeup_thread(HAL::StackFrame* stack) { - Kernel::UserProcessHelper::StartScheduling(); + NeOS::UserProcessHelper::StartScheduling(); } /// @brief makes the thread sleep on a loop. @@ -49,4 +49,4 @@ namespace Kernel /* Nothing to do, code is spinning */ } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc index ffd02eb5..9b3380c3 100644 --- a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc @@ -26,24 +26,24 @@ ///! @file HalTimer.cc
///! @brief Hardware Timer (HPET)
-namespace Kernel::Detail
+namespace NeOS::Detail
{
- struct HPET_BLOCK : public Kernel::SDT
+ struct HPET_BLOCK : public NeOS::SDT
{
- Kernel::UInt8 hardware_rev_id;
- Kernel::UInt8 comparator_count : 5;
- Kernel::UInt8 counter_size : 1;
- Kernel::UInt8 reserved : 1;
- Kernel::UInt8 legacy_replacement : 1;
- Kernel::UInt16 pci_vendor_id;
- ACPI_ADDRESS address;
- Kernel::UInt8 hpet_number;
- Kernel::UInt16 minimum_tick;
- Kernel::UInt8 page_protection;
+ NeOS::UInt8 hardware_rev_id;
+ NeOS::UInt8 comparator_count : 5;
+ NeOS::UInt8 counter_size : 1;
+ NeOS::UInt8 reserved : 1;
+ NeOS::UInt8 legacy_replacement : 1;
+ NeOS::UInt16 pci_vendor_id;
+ ACPI_ADDRESS address;
+ NeOS::UInt8 hpet_number;
+ NeOS::UInt16 minimum_tick;
+ NeOS::UInt8 page_protection;
} PACKED;
-} // namespace Kernel::Detail
+} // namespace NeOS::Detail
-using namespace Kernel;
+using namespace NeOS;
HardwareTimer::HardwareTimer(Int64 ms)
: fWaitFor(ms)
diff --git a/dev/Kernel/HALKit/AMD64/Hypervisor.h b/dev/Kernel/HALKit/AMD64/Hypervisor.h index 05539c06..4c226eee 100644 --- a/dev/Kernel/HALKit/AMD64/Hypervisor.h +++ b/dev/Kernel/HALKit/AMD64/Hypervisor.h @@ -8,7 +8,7 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { MAKE_STRING_ENUM(HYPERVISOR) ENUM_STRING(Qemu, "TCGTCGTCGTCG"); @@ -22,4 +22,4 @@ namespace Kernel ENUM_STRING(Bhyve, "bhyve bhyve "); ENUM_STRING(Qnx, " QNXQVMBSQG "); END_STRING_ENUM() -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc index e9981315..fef5ec8d 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/DMA.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/DMA.cc @@ -6,7 +6,7 @@ #include <KernelKit/PCI/DMA.h> -namespace Kernel +namespace NeOS { DMAWrapper::operator bool() { @@ -80,4 +80,4 @@ namespace Kernel fAddress = Ptr; return *this; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/PCI/Database.cc b/dev/Kernel/HALKit/AMD64/PCI/Database.cc index 17bbfe57..c5aa1282 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Database.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Database.cc @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Database.h> -namespace Kernel +namespace NeOS { } diff --git a/dev/Kernel/HALKit/AMD64/PCI/Device.cc b/dev/Kernel/HALKit/AMD64/PCI/Device.cc index 02d94163..576fe026 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Device.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Device.cc @@ -7,30 +7,30 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/PCI/Device.h> -Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) +NeOS::UInt NE_PCIReadRaw(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) { - Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | + ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + (bar & 0xFC); - Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + target); - Kernel::HAL::rt_wait_400ns(); + NeOS::HAL::rt_wait_400ns(); - return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); + return NeOS::HAL::rt_in32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigData); } -void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) +void NE_PCISetCfgTarget(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) { - Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | - ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | - (bar & 0xFC); + NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | + ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + (bar & 0xFC); - Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, - target); + NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + target); - Kernel::HAL::rt_wait_400ns(); + NeOS::HAL::rt_wait_400ns(); } #define PCI_BAR_IO 0x01 @@ -38,7 +38,7 @@ void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev #define PCI_BAR_64 0x04 #define PCI_BAR_PREFETCH 0x08 -namespace Kernel::PCI +namespace NeOS::PCI { Device::Device(UShort bus, UShort device, UShort func, UInt32 bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -168,4 +168,4 @@ namespace Kernel::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/HALKit/AMD64/PCI/Express.cc b/dev/Kernel/HALKit/AMD64/PCI/Express.cc index 341d2e69..487cbd39 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Express.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Express.cc @@ -6,6 +6,6 @@ #include <KernelKit/PCI/Express.h> -namespace Kernel +namespace NeOS { } diff --git a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc index de5564dd..9758e021 100644 --- a/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc +++ b/dev/Kernel/HALKit/AMD64/PCI/Iterator.cc @@ -6,7 +6,7 @@ #include <KernelKit/PCI/Iterator.h> -namespace Kernel::PCI +namespace NeOS::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -36,4 +36,4 @@ namespace Kernel::PCI { return fDevices[at]; } -} // namespace Kernel::PCI +} // namespace NeOS::PCI diff --git a/dev/Kernel/HALKit/AMD64/Paging.h b/dev/Kernel/HALKit/AMD64/Paging.h index fbac9bd1..4e2ac1b1 100644 --- a/dev/Kernel/HALKit/AMD64/Paging.h +++ b/dev/Kernel/HALKit/AMD64/Paging.h @@ -31,15 +31,15 @@ #endif // !kAlign EXTERN_C void hal_flush_tlb(); -EXTERN_C void hal_invl_tlb(Kernel::VoidPtr addr); -EXTERN_C void hal_write_cr3(Kernel::VoidPtr cr3); -EXTERN_C void hal_write_cr0(Kernel::VoidPtr bit); +EXTERN_C void hal_invl_tlb(NeOS::VoidPtr addr); +EXTERN_C void hal_write_cr3(NeOS::VoidPtr cr3); +EXTERN_C void hal_write_cr0(NeOS::VoidPtr bit); -EXTERN_C Kernel::VoidPtr hal_read_cr0(); // @brief CPU control register. -EXTERN_C Kernel::VoidPtr hal_read_cr2(); // @brief Fault address. -EXTERN_C Kernel::VoidPtr hal_read_cr3(); // @brief Page table. +EXTERN_C NeOS::VoidPtr hal_read_cr0(); // @brief CPU control register. +EXTERN_C NeOS::VoidPtr hal_read_cr2(); // @brief Fault address. +EXTERN_C NeOS::VoidPtr hal_read_cr3(); // @brief Page table. -namespace Kernel::HAL +namespace NeOS::HAL { /// @brief Final page entry (Not PML, PDPT) struct PACKED NE_PTE final @@ -90,10 +90,10 @@ namespace Kernel::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace Kernel::HAL +} // namespace NeOS::HAL -namespace Kernel +namespace NeOS { typedef HAL::NE_PTE PTE; typedef HAL::NE_PDE PDE; -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/AMD64/Processor.h b/dev/Kernel/HALKit/AMD64/Processor.h index db91d138..1395f03b 100644 --- a/dev/Kernel/HALKit/AMD64/Processor.h +++ b/dev/Kernel/HALKit/AMD64/Processor.h @@ -49,7 +49,7 @@ EXTERN_C #define kTaskGate (0b10001100) #define kIDTSelector (0x08) -namespace Kernel +namespace NeOS { namespace Detail::AMD64 { @@ -64,9 +64,9 @@ namespace Kernel UInt32 Zero; // reserved }; } // namespace Detail::AMD64 -} // namespace Kernel +} // namespace NeOS -namespace Kernel::HAL +namespace NeOS::HAL { /// @brief Memory Manager mapping flags. enum @@ -312,15 +312,15 @@ namespace Kernel::HAL EXTERN_C Void rt_sti(); EXTERN_C Void rt_cld(); EXTERN_C Void rt_std(); -} // namespace Kernel::HAL +} // namespace NeOS::HAL -EXTERN_C Kernel::Void idt_handle_generic(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_gpf(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_math(Kernel::UIntPtr rsp); -EXTERN_C Kernel::Void idt_handle_pf(Kernel::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_generic(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_gpf(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_math(NeOS::UIntPtr rsp); +EXTERN_C NeOS::Void idt_handle_pf(NeOS::UIntPtr rsp); -EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_idt(Kernel::HAL::Register64 ptr); -EXTERN_C ATTRIBUTE(naked) Kernel::Void hal_load_gdt(Kernel::HAL::RegisterGDT ptr); +EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_idt(NeOS::HAL::Register64 ptr); +EXTERN_C ATTRIBUTE(naked) NeOS::Void hal_load_gdt(NeOS::HAL::RegisterGDT ptr); -inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline NeOS::VoidPtr kKernelBitMpStart = nullptr; +inline NeOS::UIntPtr kKernelBitMpSize = 0UL; diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index 2dc17deb..5bc960e0 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -46,38 +46,38 @@ enum kSATABar5 = 0x24, }; -STATIC Kernel::PCI::Device kPCIDevice; -STATIC HbaMem* kSATA = nullptr; -STATIC Kernel::SizeT kSATAPortIdx = 0UL; -STATIC Kernel::Lba kCurrentDiskSectorCount = 0UL; +STATIC NeOS::PCI::Device kPCIDevice; +STATIC HbaMem* kSATA = nullptr; +STATIC NeOS::SizeT kSATAPortIdx = 0UL; +STATIC NeOS::Lba kCurrentDiskSectorCount = 0UL; template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> -static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) noexcept; +static NeOS::Void drv_std_input_output(NeOS::UInt64 lba, NeOS::UInt8* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) noexcept; -static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept; +static NeOS::Int32 drv_find_cmd_slot(HbaPort* port) noexcept; -static Kernel::Void drv_calculate_disk_geometry() noexcept; +static NeOS::Void drv_calculate_disk_geometry() noexcept; -static Kernel::Void drv_calculate_disk_geometry() noexcept +static NeOS::Void drv_calculate_disk_geometry() noexcept { kCurrentDiskSectorCount = 0UL; - Kernel::UInt8 identify_data[kib_cast(4)] = {0}; + NeOS::UInt8 identify_data[kib_cast(4)] = {0}; drv_std_input_output<NO, YES, YES>(0, identify_data, 0, kib_cast(8)); kCurrentDiskSectorCount = (identify_data[61] << 16) | identify_data[60]; - kout << "Disk Size: " << Kernel::number(drv_get_size()) << endl; - kout << "Highest LBA: " << Kernel::number(kCurrentDiskSectorCount) << endl; + kout << "Disk Size: " << NeOS::number(drv_get_size()) << endl; + kout << "Highest LBA: " << NeOS::number(kCurrentDiskSectorCount) << endl; } /// @brief Initializes an AHCI disk. /// @param PortsImplemented the amount of kSATA that have been detected. /// @return if the disk was successfully initialized or not. -Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) +NeOS::Boolean drv_std_init(NeOS::UInt16& PortsImplemented) { - using namespace Kernel; + using namespace NeOS; PCI::Iterator iterator(Types::PciDeviceKind::MassStorageController); @@ -94,22 +94,22 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) HbaMem* mem_ahci = (HbaMem*)kPCIDevice.Bar(0x24); - Kernel::UInt32 ports_implemented = mem_ahci->Pi; - Kernel::UInt16 ahci_index = 0; + NeOS::UInt32 ports_implemented = mem_ahci->Pi; + NeOS::UInt16 ahci_index = 0; - const Kernel::UInt16 kMaxPortsImplemented = kAhciPortCnt; - const Kernel::UInt32 kSATASignature = 0x00000101; - const Kernel::UInt8 kAhciPresent = 0x03; - const Kernel::UInt8 kAhciIPMActive = 0x01; + const NeOS::UInt16 kMaxPortsImplemented = kAhciPortCnt; + const NeOS::UInt32 kSATASignature = 0x00000101; + const NeOS::UInt8 kAhciPresent = 0x03; + const NeOS::UInt8 kAhciIPMActive = 0x01; - Kernel::Boolean detected = false; + NeOS::Boolean detected = false; while (ahci_index < kMaxPortsImplemented) { if (ports_implemented) { - Kernel::UInt8 ipm = (mem_ahci->Ports[ahci_index].Ssts >> 8) & 0x0F; - Kernel::UInt8 det = mem_ahci->Ports[ahci_index].Ssts & 0x0F; + NeOS::UInt8 ipm = (mem_ahci->Ports[ahci_index].Ssts >> 8) & 0x0F; + NeOS::UInt8 det = mem_ahci->Ports[ahci_index].Ssts & 0x0F; if (mem_ahci->Ports[ahci_index].Sig == kSATASignature && det == kAhciPresent && ipm == kAhciIPMActive) { @@ -137,29 +137,29 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) return No; } -Kernel::Boolean drv_std_detected(Kernel::Void) +NeOS::Boolean drv_std_detected(NeOS::Void) { - return kPCIDevice.DeviceId() != (Kernel::UShort)Kernel::PCI::PciConfigKind::Invalid; + return kPCIDevice.DeviceId() != (NeOS::UShort)NeOS::PCI::PciConfigKind::Invalid; } -Kernel::Void drv_std_write(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) +NeOS::Void drv_std_write(NeOS::UInt64 lba, NeOS::Char* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) { - drv_std_input_output<YES, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer); + drv_std_input_output<YES, YES, NO>(lba, (NeOS::UInt8*)buffer, sector_sz, size_buffer); } -Kernel::Void drv_std_read(Kernel::UInt64 lba, Kernel::Char* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) +NeOS::Void drv_std_read(NeOS::UInt64 lba, NeOS::Char* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) { - drv_std_input_output<NO, YES, NO>(lba, (Kernel::UInt8*)buffer, sector_sz, size_buffer); + drv_std_input_output<NO, YES, NO>(lba, (NeOS::UInt8*)buffer, sector_sz, size_buffer); } -static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept +static NeOS::Int32 drv_find_cmd_slot(HbaPort* port) noexcept { if (port == nullptr) return -1; - Kernel::UInt32 slots = (kSATA->Ports[kSATAPortIdx].Sact | kSATA->Ports[kSATAPortIdx].Ci); + NeOS::UInt32 slots = (kSATA->Ports[kSATAPortIdx].Sact | kSATA->Ports[kSATAPortIdx].Ci); - for (Kernel::Int32 i = 0; i < kAhciPortCnt; ++i) + for (NeOS::Int32 i = 0; i < kAhciPortCnt; ++i) { if ((slots & 1) == 0) return i; @@ -173,7 +173,7 @@ static Kernel::Int32 drv_find_cmd_slot(HbaPort* port) noexcept BOOL kAHCICommandIssued = NO; template <BOOL Write, BOOL CommandOrCTRL, BOOL Identify> -static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buffer, Kernel::SizeT sector_sz, Kernel::SizeT size_buffer) noexcept +static NeOS::Void drv_std_input_output(NeOS::UInt64 lba, NeOS::UInt8* buffer, NeOS::SizeT sector_sz, NeOS::SizeT size_buffer) noexcept { kSATA->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdFre; kSATA->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdST; @@ -185,33 +185,33 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff if (slot == -1) return; - volatile HbaCmdHeader* command_header = ((volatile HbaCmdHeader*)((Kernel::UInt64)kSATA->Ports[kSATAPortIdx].Clb)); + volatile HbaCmdHeader* command_header = ((volatile HbaCmdHeader*)((NeOS::UInt64)kSATA->Ports[kSATAPortIdx].Clb)); command_header += slot; MUST_PASS(command_header); - command_header->Cfl = sizeof(FisRegH2D) / sizeof(Kernel::UInt32); + command_header->Cfl = sizeof(FisRegH2D) / sizeof(NeOS::UInt32); command_header->Write = Write; command_header->Prdtl = 2; - volatile HbaCmdTbl* command_table = (volatile HbaCmdTbl*)((Kernel::UInt64)command_header->Ctba); + volatile HbaCmdTbl* command_table = (volatile HbaCmdTbl*)((NeOS::UInt64)command_header->Ctba); MUST_PASS(command_table); - auto buffer_phys = Kernel::HAL::hal_get_phys_address(buffer); + auto buffer_phys = NeOS::HAL::hal_get_phys_address(buffer); - command_table->Prdt[0].Dba = ((Kernel::UInt32)(Kernel::UInt64)buffer_phys); - command_table->Prdt[0].Dbau = (((Kernel::UInt64)(buffer_phys) >> 32)); + command_table->Prdt[0].Dba = ((NeOS::UInt32)(NeOS::UInt64)buffer_phys); + command_table->Prdt[0].Dbau = (((NeOS::UInt64)(buffer_phys) >> 32)); command_table->Prdt[0].Dbc = ((size_buffer / 2) - 1); command_table->Prdt[0].Ie = YES; - command_table->Prdt[1].Dba = ((Kernel::UInt32)(Kernel::UInt64)(buffer_phys + ((size_buffer / 2) - 1))); - command_table->Prdt[1].Dbau = (((Kernel::UInt64)(buffer_phys + ((size_buffer / 2) - 1)) >> 32)); + command_table->Prdt[1].Dba = ((NeOS::UInt32)(NeOS::UInt64)(buffer_phys + ((size_buffer / 2) - 1))); + command_table->Prdt[1].Dbau = (((NeOS::UInt64)(buffer_phys + ((size_buffer / 2) - 1)) >> 32)); command_table->Prdt[1].Dbc = ((size_buffer / 2) - 1); command_table->Prdt[1].Ie = YES; - volatile FisRegH2D* h2d_fis = (volatile FisRegH2D*)((Kernel::UInt64)&command_table->Cfis); + volatile FisRegH2D* h2d_fis = (volatile FisRegH2D*)((NeOS::UInt64)&command_table->Cfis); h2d_fis->FisType = kFISTypeRegH2D; h2d_fis->CmdOrCtrl = CommandOrCTRL; @@ -245,7 +245,7 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff { if (kSATA->Is & kHBAErrTaskFile) // check for task file error. { - Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); + NeOS::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); } } @@ -254,7 +254,7 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff if (kSATA->Is & kHBAErrTaskFile) // check for task file error. { - Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); + NeOS::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); } } @@ -262,14 +262,14 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff @brief Gets the number of sectors inside the drive. @return Sector size in bytes. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return kCurrentDiskSectorCount; } /// @brief Get the drive size. /// @return Disk size in bytes. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return drv_get_sector_count() * kAHCISectorSize; } diff --git a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc index 646af906..eafd86fa 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc @@ -23,16 +23,16 @@ #define kATADataLen 256 -using namespace Kernel; -using namespace Kernel::HAL; +using namespace NeOS; +using namespace NeOS::HAL; /// BUGS: 0 STATIC Boolean kATADetected = false; STATIC Int32 kATADeviceType = kATADeviceCount; STATIC Char kATAData[kATADataLen] = {0}; -STATIC Kernel::PCI::Device kATADevice; -STATIC Char kCurrentDiskModel[50] = {"UNKNOWN ATA DRIVE"}; +STATIC NeOS::PCI::Device kATADevice; +STATIC Char kCurrentDiskModel[50] = {"UNKNOWN ATA DRIVE"}; Boolean drv_std_wait_io(UInt16 IO) { @@ -105,7 +105,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) for (SizeT i = 0ul; i < kATADataLen; ++i) { drv_std_wait_io(IO); - kATAData[i] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + kATAData[i] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); drv_std_wait_io(IO); } @@ -133,7 +133,7 @@ Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) namespace Details { - using namespace Kernel; + using namespace NeOS; struct PRD final { @@ -238,13 +238,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/Kernel/HALKit/AMD64/Storage/PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/PIO.cc index 0b19b373..2563738a 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/PIO.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/PIO.cc @@ -20,8 +20,8 @@ #ifdef __ATA_PIO__ -using namespace Kernel; -using namespace Kernel::HAL; +using namespace NeOS; +using namespace NeOS::HAL; /// bugs: 0 @@ -96,10 +96,10 @@ ATAInit_Retry: for (SizeT i = 0ul; i < kATADataLen; ++i) { - kATAData[i] = Kernel::HAL::rt_in16(OutBus + ATA_REG_DATA); + kATAData[i] = NeOS::HAL::rt_in16(OutBus + ATA_REG_DATA); } - for (Kernel::Int32 i = 0; i < 20; i++) + for (NeOS::Int32 i = 0; i < 20; i++) { kCurrentDiskModel[i * 2] = kATAData[27 + i] >> 8; kCurrentDiskModel[i * 2 + 1] = kATAData[27 + i + 1] & 0xFF; @@ -135,7 +135,7 @@ Void drv_std_read(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorSz for (SizeT IndexOff = 0; IndexOff < Size; ++IndexOff) { drv_std_wait_io(IO); - Buf[IndexOff] = Kernel::HAL::rt_in16(IO + ATA_REG_DATA); + Buf[IndexOff] = NeOS::HAL::rt_in16(IO + ATA_REG_DATA); } } @@ -175,13 +175,13 @@ Boolean drv_std_detected(Void) /*** @brief Getter, gets the number of sectors inside the drive. */ -Kernel::SizeT drv_get_sector_count() +NeOS::SizeT drv_get_sector_count() { return (kATAData[61] << 16) | kATAData[60]; } /// @brief Get the drive size. -Kernel::SizeT drv_get_size() +NeOS::SizeT drv_get_size() { return (drv_get_sector_count()) * kATASectorSize; } diff --git a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc b/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc index 2ed2444d..a3366da4 100644 --- a/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc +++ b/dev/Kernel/HALKit/ARM64/APM/APM+IO.cc @@ -7,7 +7,7 @@ #include <Mod/APM/APM.h> #include <KernelKit/LPC.h> -using namespace Kernel; +using namespace NeOS; /// @brief Send APM command to it's space. /// @param base_dma the IO base port. diff --git a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h b/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h index e987cf81..d263f9b8 100644 --- a/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h +++ b/dev/Kernel/HALKit/ARM64/ApplicationProcessor.h @@ -13,7 +13,7 @@ /* INITIALIZE THE GIC ON CPU. */ /************************************************** */ -namespace Kernel +namespace NeOS { - BOOL mp_initialize_gic(Kernel::Void); + BOOL mp_initialize_gic(NeOS::Void); }
\ No newline at end of file diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc index dd62d439..6dcfa9a2 100644 --- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc @@ -10,7 +10,7 @@ #include <KernelKit/MemoryMgr.h> #include <Mod/APM/APM.h> -namespace Kernel +namespace NeOS { ACPIFactoryInterface::ACPIFactoryInterface(VoidPtr rsp_ptr) : fRsdp(rsp_ptr), fEntries(0) @@ -28,4 +28,4 @@ namespace Kernel { apm_send_io_command(kAPMPowerCommandReboot, 0); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc b/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc index c2bea7e3..415ad5b1 100644 --- a/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc +++ b/dev/Kernel/HALKit/ARM64/HalApplicationProcessor.cc @@ -28,7 +28,7 @@ // ================================================================= //
-namespace Kernel
+namespace NeOS
{
struct PROCESS_CONTROL_BLOCK final
{
@@ -133,4 +133,4 @@ namespace Kernel return NO;
}
-} // namespace Kernel
\ No newline at end of file +} // namespace NeOS
\ No newline at end of file diff --git a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc b/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc index ae3c0e44..65a7e79a 100644 --- a/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/ARM64/HalDebugOutput.cc @@ -9,7 +9,7 @@ #include <NewKit/Utils.h> #include <NewKit/New.h> -namespace Kernel +namespace NeOS { EXTERN_C void ke_io_write(const Char* bytes) { @@ -76,8 +76,8 @@ namespace Kernel TerminalDevice TerminalDevice::The() noexcept { - TerminalDevice out(Kernel::ke_io_write, Kernel::ke_io_read); + TerminalDevice out(NeOS::ke_io_write, NeOS::ke_io_read); return out; } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc index 40089c2d..afb1cc0e 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc @@ -19,7 +19,7 @@ #include <CFKit/Property.h> EXTERN_C void hal_init_platform( - Kernel::HEL::BootInfoHeader* handover_hdr) + NeOS::HEL::BootInfoHeader* handover_hdr) { /************************************************** */ @@ -39,12 +39,12 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( - reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( + reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); /// @note do initialize the interrupts after it. - Kernel::mp_initialize_gic(); + NeOS::mp_initialize_gic(); while (YES) { diff --git a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc b/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc index d7884682..cdf6e1b1 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelPanic.cc @@ -18,7 +18,7 @@ /* Each error code is attributed with an ID, which will prompt a string onto the * screen. Wait for debugger... */ -namespace Kernel +namespace NeOS { /// @brief Dumping factory class. class RecoveryFactory final @@ -31,7 +31,7 @@ namespace Kernel /// @brief Stops execution of the kernel. /// @param id kernel stop ID. /***********************************************************************************/ - Void ke_panic(const Kernel::Int32& id, const Char* message) + Void ke_panic(const NeOS::Int32& id, const Char* message) { fb_init(); @@ -77,4 +77,4 @@ namespace Kernel ke_panic(RUNTIME_CHECK_FAILED, file); // Runtime Check failed } } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc index b565409f..e04b77cd 100644 --- a/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalPagingMgrARM64.cc @@ -10,7 +10,7 @@ #include <HALKit/ARM64/Paging.h> #include <HALKit/ARM64/Processor.h> -namespace Kernel::HAL +namespace NeOS::HAL { typedef UInt32 PageTableIndex; @@ -83,4 +83,4 @@ namespace Kernel::HAL return 0; } -} // namespace Kernel::HAL +} // namespace NeOS::HAL diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc index 629e4eca..55c8aab5 100644 --- a/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCoreARM64.cc @@ -6,7 +6,7 @@ #include <KernelKit/UserProcessScheduler.h> -namespace Kernel +namespace NeOS { /// @brief Wakes up thread. /// Wakes up thread from the hang state. @@ -21,4 +21,4 @@ namespace Kernel { NE_UNUSED(stack); } -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc b/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc index 00a11fac..3a9b7074 100644 --- a/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc +++ b/dev/Kernel/HALKit/ARM64/HalSchedulerCorePrimitivesARM64.cc @@ -7,7 +7,7 @@ #include <HALKit/ARM64/Processor.h>
#include <KernelKit/UserProcessScheduler.h>
-namespace Kernel
+namespace NeOS
{
/***********************************************************************************/
/// @brief Unimplemented function (crashes by default)
@@ -32,4 +32,4 @@ namespace Kernel return stack_ptr->SP != 0 && stack_ptr->BP != 0;
}
-} // namespace Kernel
+} // namespace NeOS
diff --git a/dev/Kernel/HALKit/ARM64/Paging.h b/dev/Kernel/HALKit/ARM64/Paging.h index c27b982b..3c24f757 100644 --- a/dev/Kernel/HALKit/ARM64/Paging.h +++ b/dev/Kernel/HALKit/ARM64/Paging.h @@ -56,7 +56,7 @@ M, N \ } -namespace Kernel::HAL +namespace NeOS::HAL { struct PACKED PTE_4KB final { @@ -109,12 +109,12 @@ namespace Kernel::HAL auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page) -> VoidPtr; auto mm_free_bitmap(VoidPtr page_ptr) -> Bool; -} // namespace Kernel::HAL +} // namespace NeOS::HAL -namespace Kernel +namespace NeOS { typedef HAL::PTE_4KB PTE; typedef HAL::PDE_4KB PDE; -} // namespace Kernel +} // namespace NeOS EXTERN_C void hal_flush_tlb(); diff --git a/dev/Kernel/HALKit/ARM64/Processor.h b/dev/Kernel/HALKit/ARM64/Processor.h index 023b6bfb..4dba5a8b 100644 --- a/dev/Kernel/HALKit/ARM64/Processor.h +++ b/dev/Kernel/HALKit/ARM64/Processor.h @@ -13,7 +13,7 @@ #define kCPUBackendName "ARMv8" -namespace Kernel::HAL +namespace NeOS::HAL { struct PACKED Register64 final { @@ -81,11 +81,11 @@ namespace Kernel::HAL { asm volatile("wfi"); } -} // namespace Kernel::HAL +} // namespace NeOS::HAL -inline Kernel::VoidPtr kKernelBitMpStart = nullptr; -inline Kernel::UIntPtr kKernelBitMpSize = 0UL; +inline NeOS::VoidPtr kKernelBitMpStart = nullptr; +inline NeOS::UIntPtr kKernelBitMpSize = 0UL; -inline Kernel::VoidPtr kKernelPhysicalStart = nullptr; +inline NeOS::VoidPtr kKernelPhysicalStart = nullptr; #include <HALKit/ARM64/Paging.h> diff --git a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc index f5553f3e..18071fea 100644 --- a/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc +++ b/dev/Kernel/HALKit/ARM64/Storage/MFlash+IO.cc @@ -16,7 +16,7 @@ #define kMaxFlashSlots (8U) -namespace Kernel +namespace NeOS { /// /Mount/Flash/n constexpr auto kFlashBridgeMagic = "FLSH"; @@ -79,6 +79,6 @@ namespace Kernel return YES; } -} // namespace Kernel +} // namespace NeOS #endif // if NE_USE_MBCI_FLASH diff --git a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp b/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp index 233bc5e0..f77186fd 100644 --- a/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp +++ b/dev/Kernel/HALKit/AXP/CoreSyscallHandlerDEC.cpp @@ -10,7 +10,7 @@ /// @brief Internal call for syscall, to work with C++. /// @param stack /// @return nothing. -EXTERN_C void rt_syscall_handle(Kernel::HAL::StackFrame* stack) +EXTERN_C void rt_syscall_handle(NeOS::HAL::StackFrame* stack) { if (stack->Rcx <= (kSyscalls.Count() - 1)) { diff --git a/dev/Kernel/HALKit/POWER/AP.h b/dev/Kernel/HALKit/POWER/AP.h index 12ba467c..e0ef3ffb 100644 --- a/dev/Kernel/HALKit/POWER/AP.h +++ b/dev/Kernel/HALKit/POWER/AP.h @@ -15,25 +15,25 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { struct HAL_HARDWARE_THREAD; /// @brief hardware thread indentification type. - typedef Kernel::Int32 hal_ap_kind; + typedef NeOS::Int32 hal_ap_kind; /// @brief Hardware thread information structure. typedef struct HAL_HARDWARE_THREAD { - Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + NeOS::UIntPtr fStartAddress; + NeOS::UInt8 fPrivleged : 1; + NeOS::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); -} // namespace Kernel + EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); +} // namespace NeOS diff --git a/dev/Kernel/HALKit/POWER/HalAP.cc b/dev/Kernel/HALKit/POWER/HalAP.cc index 00112702..32f91a5f 100644 --- a/dev/Kernel/HALKit/POWER/HalAP.cc +++ b/dev/Kernel/HALKit/POWER/HalAP.cc @@ -8,16 +8,16 @@ #include <KernelKit/DebugOutput.h> #include <HALKit/POWER/AP.h> -using namespace Kernel; +using namespace NeOS; -namespace Kernel::Detail +namespace NeOS::Detail { STATIC void mp_hang_fn(void) { while (YES) ; } -} // namespace Kernel::Detail +} // namespace NeOS::Detail /// @brief wakes up thread. /// wakes up thread from hang. @@ -36,5 +36,5 @@ void mp_hang_thread(HAL::StackFramePtr stack) if (!stack) return; - hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn)); + hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(NeOS::Detail::mp_hang_fn)); } diff --git a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc b/dev/Kernel/HALKit/POWER/HalDebugOutput.cc index 6d28a877..4362de40 100644 --- a/dev/Kernel/HALKit/POWER/HalDebugOutput.cc +++ b/dev/Kernel/HALKit/POWER/HalDebugOutput.cc @@ -7,7 +7,7 @@ #include <HALKit/POWER/Processor.h> #include <KernelKit/DebugOutput.h> -using namespace Kernel; +using namespace NeOS; /// @brief Writes to COM1. /// @param bytes diff --git a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc b/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc index 3d56f2ac..d3d4b694 100644 --- a/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc +++ b/dev/Kernel/HALKit/POWER/HalVirtualMemory.cc @@ -10,7 +10,7 @@ /// @note Refer to SoC documentation. -using namespace Kernel; +using namespace NeOS; EXTERN_C Void hal_write_tlb(UInt32 mas0, UInt32 mas1, UInt32 mas2, UInt32 mas3, UInt32 mas7) { diff --git a/dev/Kernel/HALKit/POWER/Processor.h b/dev/Kernel/HALKit/POWER/Processor.h index 6db4e3cd..bbcfd01f 100644 --- a/dev/Kernel/HALKit/POWER/Processor.h +++ b/dev/Kernel/HALKit/POWER/Processor.h @@ -14,7 +14,7 @@ #define NoOp() asm volatile("mr 0, 0") #define kHalPPCAlignment __attribute__((aligned(4))) -namespace Kernel::HAL +namespace NeOS::HAL { typedef UIntPtr Reg; @@ -47,16 +47,16 @@ namespace Kernel::HAL { NoOp(); // no oop } -} // namespace Kernel::HAL +} // namespace NeOS::HAL -EXTERN_C Kernel::Void int_handle_math(Kernel::UIntPtr sp); -EXTERN_C Kernel::Void int_handle_pf(Kernel::UIntPtr sp); +EXTERN_C NeOS::Void int_handle_math(NeOS::UIntPtr sp); +EXTERN_C NeOS::Void int_handle_pf(NeOS::UIntPtr sp); /// @brief Set TLB. -Kernel::Bool hal_set_tlb(Kernel::UInt8 tlb, Kernel::UInt32 epn, Kernel::UInt64 rpn, Kernel::UInt8 perms, Kernel::UInt8 wimge, Kernel::UInt8 ts, Kernel::UInt8 esel, Kernel::UInt8 tsize, Kernel::UInt8 iprot); +NeOS::Bool hal_set_tlb(NeOS::UInt8 tlb, NeOS::UInt32 epn, NeOS::UInt64 rpn, NeOS::UInt8 perms, NeOS::UInt8 wimge, NeOS::UInt8 ts, NeOS::UInt8 esel, NeOS::UInt8 tsize, NeOS::UInt8 iprot); /// @brief Write TLB. -Kernel::Void hal_write_tlb(Kernel::UInt32 mas0, Kernel::UInt32 mas1, Kernel::UInt32 mas2, Kernel::UInt32 mas3, Kernel::UInt32 mas7); +NeOS::Void hal_write_tlb(NeOS::UInt32 mas0, NeOS::UInt32 mas1, NeOS::UInt32 mas2, NeOS::UInt32 mas3, NeOS::UInt32 mas7); /// @brief Flush TLB. -EXTERN_C Kernel::Void hal_flush_tlb(); +EXTERN_C NeOS::Void hal_flush_tlb(); diff --git a/dev/Kernel/HALKit/RISCV/AP.h b/dev/Kernel/HALKit/RISCV/AP.h index 427c8e90..258a7b5c 100644 --- a/dev/Kernel/HALKit/RISCV/AP.h +++ b/dev/Kernel/HALKit/RISCV/AP.h @@ -15,22 +15,22 @@ #include <NewKit/Defines.h> -namespace Kernel +namespace NeOS { typedef Int64 hal_ap_kind; typedef struct HAL_HARDWARE_THREAD { - Kernel::UIntPtr fStartAddress; - Kernel::UInt8 fPrivleged : 1; - Kernel::UInt32 fPageMemoryFlags; - hal_ap_kind fIdentNumber; + NeOS::UIntPtr fStartAddress; + NeOS::UInt8 fPrivleged : 1; + NeOS::UInt32 fPageMemoryFlags; + hal_ap_kind fIdentNumber; } HAL_HARDWARE_THREAD; /// @brief Set PC to specific hart. /// @param hart the hart /// @param epc the pc. /// @return - EXTERN_C Kernel::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, Kernel::VoidPtr epc); + EXTERN_C NeOS::Void hal_set_pc_to_hart(HAL_HARDWARE_THREAD* hart, NeOS::VoidPtr epc); -} // namespace Kernel +} // namespace NeOS diff --git a/dev/Kernel/HALKit/RISCV/HalAP.cc b/dev/Kernel/HALKit/RISCV/HalAP.cc index c271f011..788acf0f 100644 --- a/dev/Kernel/HALKit/RISCV/HalAP.cc +++ b/dev/Kernel/HALKit/RISCV/HalAP.cc @@ -8,16 +8,16 @@ #include <KernelKit/DebugOutput.h>
#include <HALKit/RISCV/AP.h>
-using namespace Kernel;
+using namespace NeOS;
-namespace Kernel::Detail
+namespace NeOS::Detail
{
STATIC void mp_hang_fn(void)
{
while (YES)
;
}
-} // namespace Kernel::Detail
+} // namespace NeOS::Detail
/// @brief wakes up thread.
/// wakes up thread from hang.
@@ -36,5 +36,5 @@ void mp_hang_thread(HAL::StackFramePtr stack) if (!stack)
return;
- hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(Kernel::Detail::mp_hang_fn));
+ hal_set_pc_to_hart(reinterpret_cast<HAL_HARDWARE_THREAD*>(stack->R15), reinterpret_cast<VoidPtr>(NeOS::Detail::mp_hang_fn));
}
|
