Merged in MHR-36 (pull request #17)

MHR-36

9 files changed, 26 insertions, 20 deletions

diff --git a/Kernel/KernelKit/PCI/Database.hpp b/Kernel/KernelKit/PCI/Database.hpp
index a689306a..008cdb9a 100644
--- a/Kernel/KernelKit/PCI/Database.hpp
+++ b/Kernel/KernelKit/PCI/Database.hpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 #pragma once
diff --git a/Kernel/KernelKit/PCI/Device.hpp b/Kernel/KernelKit/PCI/Device.hpp
index 8b5388c1..bee1f631 100644
--- a/Kernel/KernelKit/PCI/Device.hpp
+++ b/Kernel/KernelKit/PCI/Device.hpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 #pragma once
diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hpp
index 48db7587..dfac226f 100644
--- a/Kernel/KernelKit/PCI/Dma.hpp
+++ b/Kernel/KernelKit/PCI/Dma.hpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 
@@ -10,7 +10,7 @@
 #include <KernelKit/PCI/Device.hpp>
 #include <NewKit/Array.hpp>
 #include <NewKit/OwnPtr.hpp>
-#include <NewKit/Ref.hpp>
+#include <NewKit/Ref.hxx>
 
 namespace Kernel
 {
@@ -52,7 +52,7 @@ namespace Kernel
 		T* Get(const UIntPtr off = 0);
 
 	public:
-			 operator bool();
+		operator bool();
 		bool operator!();
 
 	public:
diff --git a/Kernel/KernelKit/PCI/Dma.inl b/Kernel/KernelKit/PCI/Dma.inl
index 1eca8081..10a69afc 100644
--- a/Kernel/KernelKit/PCI/Dma.inl
+++ b/Kernel/KernelKit/PCI/Dma.inl
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 
@@ -17,4 +17,4 @@ namespace Kernel
 	{
 		return reinterpret_cast<T*>((UIntPtr)fAddress + offset);
 	}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PCI/Express.hpp b/Kernel/KernelKit/PCI/Express.hpp
index 7276f183..71ba4c50 100644
--- a/Kernel/KernelKit/PCI/Express.hpp
+++ b/Kernel/KernelKit/PCI/Express.hpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 
diff --git a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
index 08d33945..c1d1c0f5 100644
--- a/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/Kernel/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 	File: IO-Impl-AMD64.hpp
 	Purpose: I/O for AMD64.
@@ -51,4 +51,4 @@ namespace Kernel
 			break;
 		}
 	}
-} // namespace NewOS
+} // namespace Kernel
diff --git a/Kernel/KernelKit/PCI/IO.hpp b/Kernel/KernelKit/PCI/IO.hpp
index 262361ed..90e9244d 100644
--- a/Kernel/KernelKit/PCI/IO.hpp
+++ b/Kernel/KernelKit/PCI/IO.hpp
@@ -1,6 +1,6 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
 
@@ -9,7 +9,7 @@
 #include <ArchKit/ArchKit.hpp>
 #include <NewKit/Array.hpp>
 #include <NewKit/Defines.hpp>
-#include <NewKit/Ref.hpp>
+#include <NewKit/Ref.hxx>
 
 namespace Kernel
 {
diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hpp
index 2274df31..8c2df3b4 100644
--- a/Kernel/KernelKit/PCI/Iterator.hpp
+++ b/Kernel/KernelKit/PCI/Iterator.hpp
@@ -1,3 +1,9 @@
+/* -------------------------------------------
+
+	Copyright ZKA Technologies
+
+------------------------------------------- */
+
 #ifndef __PCI_ITERATOR_HPP__
 #define __PCI_ITERATOR_HPP__
 
@@ -5,7 +11,7 @@
 #include <KernelKit/PCI/Device.hpp>
 #include <NewKit/Array.hpp>
 #include <NewKit/Defines.hpp>
-#include <NewKit/Ref.hpp>
+#include <NewKit/Ref.hxx>
 
 #define NEWOS_BUS_COUNT		 (256)
 #define NEWOS_DEVICE_COUNT	 (33)
@@ -22,7 +28,6 @@ namespace Kernel::PCI
 		explicit Iterator(const Types::PciDeviceKind& deviceType);
 
 		Iterator& operator=(const Iterator&) = default;
-
 		Iterator(const Iterator&) = default;
 
 		~Iterator();
diff --git a/Kernel/KernelKit/PCI/PCI.hpp b/Kernel/KernelKit/PCI/PCI.hxx
index a7101a33..e75215d6 100644
--- a/Kernel/KernelKit/PCI/PCI.hpp
+++ b/Kernel/KernelKit/PCI/PCI.hxx
@@ -1,18 +1,19 @@
 /* -------------------------------------------
 
-	Copyright Zeta Electronics Corporation
+	Copyright ZKA Technologies
 
 ------------------------------------------- */
+
 #pragma once
 
 #include <NewKit/Defines.hpp>
 
-#define PCI_CONFIG_ADDRESS (0xCF8)
-#define PCI_CONFIG_DATA	   (0xCFC)
+#define cPCIConfigAddressPort (0xCF8)
+#define cPCIConfigDataPort	   (0xCFC)
 
-#define PCI_DEVICE_COUNT (32)
-#define PCI_FUNC_COUNT	 (8)
-#define PCI_BUS_COUNT	 (255)
+#define cPCIDeviceCount (32)
+#define cPCIFuncCount	 (8)
+#define cPCIBusCount	 (255)
 
 namespace Kernel::PCI
 {