diff options
Diffstat (limited to 'dev/Kernel/HALKit/AMD64/PCI')
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/PCI/DMA.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/PCI/Database.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/PCI/Device.cc | 34 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/PCI/Express.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/PCI/Iterator.cc | 4 |
5 files changed, 23 insertions, 23 deletions
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 |