From ba7b3ed69cd24970a28b72c54982735cd120e663 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 28 Mar 2025 19:57:33 +0100 Subject: kernel: breaking: Change namespace from NeOS to Kernel. sched: Fix redundancy in NeKernel's user scheduler macros, refactored the other files using the redundant macros too. part one of a series of commit for NeKernel. Signed-off-by: Amlal El Mahrouss --- dev/kernel/HALKit/AMD64/PCI/DMA.cc | 4 ++-- dev/kernel/HALKit/AMD64/PCI/Database.cc | 2 +- dev/kernel/HALKit/AMD64/PCI/Device.cc | 26 +++++++++++++------------- dev/kernel/HALKit/AMD64/PCI/Express.cc | 2 +- dev/kernel/HALKit/AMD64/PCI/Iterator.cc | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'dev/kernel/HALKit/AMD64/PCI') diff --git a/dev/kernel/HALKit/AMD64/PCI/DMA.cc b/dev/kernel/HALKit/AMD64/PCI/DMA.cc index c756a572..290030cf 100644 --- a/dev/kernel/HALKit/AMD64/PCI/DMA.cc +++ b/dev/kernel/HALKit/AMD64/PCI/DMA.cc @@ -6,7 +6,7 @@ #include -namespace NeOS +namespace Kernel { DMAWrapper::operator bool() { @@ -84,4 +84,4 @@ namespace NeOS this->fAddress = Ptr; return *this; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/HALKit/AMD64/PCI/Database.cc b/dev/kernel/HALKit/AMD64/PCI/Database.cc index c5aa1282..17bbfe57 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Database.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Database.cc @@ -6,6 +6,6 @@ #include -namespace NeOS +namespace Kernel { } diff --git a/dev/kernel/HALKit/AMD64/PCI/Device.cc b/dev/kernel/HALKit/AMD64/PCI/Device.cc index 348e058a..553ffad4 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Device.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Device.cc @@ -12,33 +12,33 @@ #define PCI_BAR_64 0x04 #define PCI_BAR_PREFETCH 0x08 -NeOS::UInt NE_PCIReadRaw(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) +Kernel::UInt NE_PCIReadRaw(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | - ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - NeOS::HAL::rt_wait_400ns(); + Kernel::HAL::rt_wait_400ns(); - return NeOS::HAL::rt_in32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigData); + return Kernel::HAL::rt_in32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigData); } -void NE_PCISetCfgTarget(NeOS::UInt bar, NeOS::UShort bus, NeOS::UShort dev, NeOS::UShort fun) +void NE_PCISetCfgTarget(Kernel::UInt bar, Kernel::UShort bus, Kernel::UShort dev, Kernel::UShort fun) { - NeOS::UInt target = 0x80000000 | ((NeOS::UInt)bus << 16) | - ((NeOS::UInt)dev << 11) | ((NeOS::UInt)fun << 8) | + Kernel::UInt target = 0x80000000 | ((Kernel::UInt)bus << 16) | + ((Kernel::UInt)dev << 11) | ((Kernel::UInt)fun << 8) | (bar & 0xFC); - NeOS::HAL::rt_out32((NeOS::UShort)NeOS::PCI::PciConfigKind::ConfigAddress, + Kernel::HAL::rt_out32((Kernel::UShort)Kernel::PCI::PciConfigKind::ConfigAddress, target); - NeOS::HAL::rt_wait_400ns(); + Kernel::HAL::rt_wait_400ns(); } -namespace NeOS::PCI +namespace Kernel::PCI { Device::Device(UShort bus, UShort device, UShort func, UInt32 bar) : fBus(bus), fDevice(device), fFunction(func), fBar(bar) @@ -168,4 +168,4 @@ namespace NeOS::PCI { return VendorId() != (UShort)PciConfigKind::Invalid; } -} // namespace NeOS::PCI +} // namespace Kernel::PCI diff --git a/dev/kernel/HALKit/AMD64/PCI/Express.cc b/dev/kernel/HALKit/AMD64/PCI/Express.cc index 487cbd39..341d2e69 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Express.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Express.cc @@ -6,6 +6,6 @@ #include -namespace NeOS +namespace Kernel { } diff --git a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc index bf215fe2..d8020ebc 100644 --- a/dev/kernel/HALKit/AMD64/PCI/Iterator.cc +++ b/dev/kernel/HALKit/AMD64/PCI/Iterator.cc @@ -6,7 +6,7 @@ #include -namespace NeOS::PCI +namespace Kernel::PCI { Iterator::Iterator(const Types::PciDeviceKind& type) { @@ -36,4 +36,4 @@ namespace NeOS::PCI { return fDevices[at]; } -} // namespace NeOS::PCI +} // namespace Kernel::PCI -- cgit v1.2.3