diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
| commit | ba7b3ed69cd24970a28b72c54982735cd120e663 (patch) | |
| tree | 934b7645435ab1bfd2d8eb99fa861fc09e3dd5b4 /dev/kernel/KernelKit/PCI | |
| parent | 2205e801a6e84238dc8cbbb8f9de5a675eae1d81 (diff) | |
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 <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/KernelKit/PCI')
| -rw-r--r-- | dev/kernel/KernelKit/PCI/DMA.h | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/DMA.inl | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/Database.h | 20 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/Device.h | 8 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/IO.h | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/IOArray+AMD64.inl | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/Iterator.h | 4 | ||||
| -rw-r--r-- | dev/kernel/KernelKit/PCI/PCI.h | 4 |
8 files changed, 26 insertions, 26 deletions
diff --git a/dev/kernel/KernelKit/PCI/DMA.h b/dev/kernel/KernelKit/PCI/DMA.h index 68f3fa37..fc49dd4f 100644 --- a/dev/kernel/KernelKit/PCI/DMA.h +++ b/dev/kernel/KernelKit/PCI/DMA.h @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.h> #include <NewKit/Ref.h> -namespace NeOS +namespace Kernel { enum class DmaKind { @@ -76,6 +76,6 @@ namespace NeOS public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace NeOS +} // namespace Kernel #include <KernelKit/PCI/DMA.inl> diff --git a/dev/kernel/KernelKit/PCI/DMA.inl b/dev/kernel/KernelKit/PCI/DMA.inl index d9c6e551..f3fb0f8c 100644 --- a/dev/kernel/KernelKit/PCI/DMA.inl +++ b/dev/kernel/KernelKit/PCI/DMA.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <class T> T* DMAWrapper::operator->() @@ -17,4 +17,4 @@ namespace NeOS { return reinterpret_cast<T*>((UIntPtr)this->fAddress + offset); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/PCI/Database.h b/dev/kernel/KernelKit/PCI/Database.h index cb12a731..82084bb1 100644 --- a/dev/kernel/KernelKit/PCI/Database.h +++ b/dev/kernel/KernelKit/PCI/Database.h @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.h> #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { namespace Types { @@ -35,24 +35,24 @@ namespace NeOS Invalid = Unassgined, }; } // namespace Types -} // namespace NeOS +} // namespace Kernel -inline BOOL operator!=(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator!=(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs != (NeOS::UChar)lhs; + return rhs != (Kernel::UChar)lhs; } -inline BOOL operator==(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator==(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs == (NeOS::UChar)lhs; + return rhs == (Kernel::UChar)lhs; } -inline BOOL operator!=(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator!=(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs != (NeOS::UChar)rhs; + return lhs != (Kernel::UChar)rhs; } -inline BOOL operator==(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator==(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs == (NeOS::UChar)rhs; + return lhs == (Kernel::UChar)rhs; }
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Device.h b/dev/kernel/KernelKit/PCI/Device.h index 9870f618..cb463485 100644 --- a/dev/kernel/KernelKit/PCI/Device.h +++ b/dev/kernel/KernelKit/PCI/Device.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace NeOS::PCI +namespace Kernel::PCI { enum class PciConfigKind : UShort { @@ -75,7 +75,7 @@ namespace NeOS::PCI UShort fFunction; UInt32 fBar; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI -EXTERN_C void NewOSPCISetCfgTarget(NeOS::UInt bar); -EXTERN_C NeOS::UInt NewOSPCIReadRaw(NeOS::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); +EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); diff --git a/dev/kernel/KernelKit/PCI/IO.h b/dev/kernel/KernelKit/PCI/IO.h index 1d60df8e..1de30b63 100644 --- a/dev/kernel/KernelKit/PCI/IO.h +++ b/dev/kernel/KernelKit/PCI/IO.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace NeOS +namespace Kernel { template <SizeT Sz> class IOArray final @@ -66,7 +66,7 @@ namespace NeOS return ports; } -} // namespace NeOS +} // namespace Kernel #ifdef __x86_64__ #include <KernelKit/PCI/IOArray+AMD64.inl> diff --git a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl index 2630fa98..223546c5 100644 --- a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl +++ b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <SizeT Sz> template <typename T> @@ -51,4 +51,4 @@ namespace NeOS break; } } -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Iterator.h b/dev/kernel/KernelKit/PCI/Iterator.h index 2a788450..c364e1f7 100644 --- a/dev/kernel/KernelKit/PCI/Iterator.h +++ b/dev/kernel/KernelKit/PCI/Iterator.h @@ -17,7 +17,7 @@ #define NE_DEVICE_COUNT (33) #define NE_FUNCTION_COUNT (8) -namespace NeOS::PCI +namespace Kernel::PCI { class Iterator final { @@ -38,6 +38,6 @@ namespace NeOS::PCI private: Array<PCI::Device, NE_BUS_COUNT> fDevices; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI #endif // __PCI_ITERATOR_H__ diff --git a/dev/kernel/KernelKit/PCI/PCI.h b/dev/kernel/KernelKit/PCI/PCI.h index 7eec9ec1..11bc7b94 100644 --- a/dev/kernel/KernelKit/PCI/PCI.h +++ b/dev/kernel/KernelKit/PCI/PCI.h @@ -15,7 +15,7 @@ #define kPCIFuncCount (8) #define kPCIBusCount (256U) -namespace NeOS::PCI +namespace Kernel::PCI { // model struct DeviceHeader @@ -56,4 +56,4 @@ namespace NeOS::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI |
