summaryrefslogtreecommitdiffhomepage
path: root/Kernel/KernelKit/PCI
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel/KernelKit/PCI')
-rw-r--r--Kernel/KernelKit/PCI/Dma.inl2
-rw-r--r--Kernel/KernelKit/PCI/IO-Impl-AMD64.inl6
2 files changed, 5 insertions, 3 deletions
diff --git a/Kernel/KernelKit/PCI/Dma.inl b/Kernel/KernelKit/PCI/Dma.inl
index 198b2609..1eca8081 100644
--- a/Kernel/KernelKit/PCI/Dma.inl
+++ b/Kernel/KernelKit/PCI/Dma.inl
@@ -4,7 +4,7 @@
------------------------------------------- */
-namespace NewOS
+namespace Kernel
{
template <class T>
T* DMAWrapper::operator->()
diff --git a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
index 59dfd4c2..08d33945 100644
--- a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -12,7 +12,7 @@
------------------------------------------- */
-namespace NewOS
+namespace Kernel
{
template <SizeT Sz>
template <typename T>
@@ -20,12 +20,14 @@ namespace NewOS
{
switch (sizeof(T))
{
+#ifdef __NEWOS_AMD64__
case 4:
return HAL::In32(fPorts[index].Leak());
case 2:
return HAL::In16(fPorts[index].Leak());
case 1:
return HAL::In8(fPorts[index].Leak());
+#endif
default:
return 0xFFFF;
}
@@ -37,7 +39,7 @@ namespace NewOS
{
switch (sizeof(T))
{
-#ifdef __x86_64__
+#ifdef __NEWOS_AMD64__
case 4:
HAL::Out32(fPorts[index].Leak(), value);
case 2: