summaryrefslogtreecommitdiffhomepage
path: root/Kernel/KernelKit/PCI
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel/KernelKit/PCI')
-rw-r--r--Kernel/KernelKit/PCI/Database.hpp4
-rw-r--r--Kernel/KernelKit/PCI/Device.hpp8
-rw-r--r--Kernel/KernelKit/PCI/Dma.hpp4
-rw-r--r--Kernel/KernelKit/PCI/IO.hpp4
-rw-r--r--Kernel/KernelKit/PCI/Iterator.hpp4
-rw-r--r--Kernel/KernelKit/PCI/PCI.hpp4
6 files changed, 14 insertions, 14 deletions
diff --git a/Kernel/KernelKit/PCI/Database.hpp b/Kernel/KernelKit/PCI/Database.hpp
index 9cd04610..a689306a 100644
--- a/Kernel/KernelKit/PCI/Database.hpp
+++ b/Kernel/KernelKit/PCI/Database.hpp
@@ -8,7 +8,7 @@
#include <KernelKit/PCI/Device.hpp>
#include <NewKit/Defines.hpp>
-namespace NewOS
+namespace Kernel
{
namespace Types
{
@@ -35,4 +35,4 @@ namespace NewOS
Invalid = Unassgined,
};
} // namespace Types
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PCI/Device.hpp b/Kernel/KernelKit/PCI/Device.hpp
index 313adca9..8b5388c1 100644
--- a/Kernel/KernelKit/PCI/Device.hpp
+++ b/Kernel/KernelKit/PCI/Device.hpp
@@ -7,7 +7,7 @@
#include <NewKit/Defines.hpp>
-namespace NewOS::PCI
+namespace Kernel::PCI
{
enum class PciConfigKind : UShort
{
@@ -73,7 +73,7 @@ namespace NewOS::PCI
UShort fFunction;
UShort fBar;
};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI
-EXTERN_C void NewOSPCISetCfgTarget(NewOS::UInt bar);
-EXTERN_C NewOS::UInt NewOSPCIReadRaw(NewOS::UInt bar);
+EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar);
+EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar);
diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hpp
index 25e90d79..48db7587 100644
--- a/Kernel/KernelKit/PCI/Dma.hpp
+++ b/Kernel/KernelKit/PCI/Dma.hpp
@@ -12,7 +12,7 @@
#include <NewKit/OwnPtr.hpp>
#include <NewKit/Ref.hpp>
-namespace NewOS
+namespace Kernel
{
enum class DmaKind
{
@@ -76,6 +76,6 @@ namespace NewOS
public:
static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma);
};
-} // namespace NewOS
+} // namespace Kernel
#include <KernelKit/PCI/Dma.inl>
diff --git a/Kernel/KernelKit/PCI/IO.hpp b/Kernel/KernelKit/PCI/IO.hpp
index cd44764c..262361ed 100644
--- a/Kernel/KernelKit/PCI/IO.hpp
+++ b/Kernel/KernelKit/PCI/IO.hpp
@@ -11,7 +11,7 @@
#include <NewKit/Defines.hpp>
#include <NewKit/Ref.hpp>
-namespace NewOS
+namespace Kernel
{
template <SizeT Sz>
class IOArray final
@@ -50,7 +50,7 @@ namespace NewOS
};
using IOArray16 = IOArray<16>;
-} // namespace NewOS
+} // namespace Kernel
#ifdef __x86_64__
#include <KernelKit/PCI/IO-Impl-AMD64.inl>
diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hpp
index 278711a7..2274df31 100644
--- a/Kernel/KernelKit/PCI/Iterator.hpp
+++ b/Kernel/KernelKit/PCI/Iterator.hpp
@@ -11,7 +11,7 @@
#define NEWOS_DEVICE_COUNT (33)
#define NEWOS_FUNCTION_COUNT (8)
-namespace NewOS::PCI
+namespace Kernel::PCI
{
class Iterator final
{
@@ -33,6 +33,6 @@ namespace NewOS::PCI
private:
Array<PCI::Device, NEWOS_BUS_COUNT> fDevices;
};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI
#endif // __PCI_ITERATOR_HPP__
diff --git a/Kernel/KernelKit/PCI/PCI.hpp b/Kernel/KernelKit/PCI/PCI.hpp
index c0c035b9..a7101a33 100644
--- a/Kernel/KernelKit/PCI/PCI.hpp
+++ b/Kernel/KernelKit/PCI/PCI.hpp
@@ -14,7 +14,7 @@
#define PCI_FUNC_COUNT (8)
#define PCI_BUS_COUNT (255)
-namespace NewOS::PCI
+namespace Kernel::PCI
{
// model
struct DeviceHeader
@@ -55,4 +55,4 @@ namespace NewOS::PCI
Detail::BAR BAR4;
Detail::BAR BAR5;
};
-} // namespace NewOS::PCI
+} // namespace Kernel::PCI