From 8c8822fff78f9ff9cd640271da9b3634c4c2f97f Mon Sep 17 00:00:00 2001
From: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
Date: Wed, 3 Jul 2024 09:15:28 +0200
Subject: FIX:

- Fix compiler errors inside .inl files.
- Update kernel icon.
- Add .inl files to project.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
---
 Kernel/KernelKit/PCI/Dma.inl            |  2 +-
 Kernel/KernelKit/PCI/IO-Impl-AMD64.inl  |  6 ++++--
 Kernel/KernelKit/ThreadLocalStorage.inl | 12 +++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'Kernel/KernelKit')

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:
diff --git a/Kernel/KernelKit/ThreadLocalStorage.inl b/Kernel/KernelKit/ThreadLocalStorage.inl
index 6dbff3a1..c6e61059 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.inl
+++ b/Kernel/KernelKit/ThreadLocalStorage.inl
@@ -6,14 +6,14 @@
 
 //! @brief Allocates a pointer from the process's tls.
 
-#ifndef __PROCESS_MANAGER__
+#ifndef _INC_PROCESS_SCHEDULER_HXX_
 #include <KernelKit/ProcessScheduler.hxx>
 #endif
 
 template <typename T>
 inline T* tls_new_ptr(void)
 {
-	using namespace NewOS;
+	using namespace Kernel;
 
 	MUST_PASS(ProcessScheduler::The().Leak().TheCurrent());
 
@@ -30,7 +30,7 @@ inline bool tls_delete_ptr(T* ptr)
 	if (!ptr)
 		return false;
 
-	using namespace NewOS;
+	using namespace Kernel;
 
 	MUST_PASS(ProcessScheduler::The().Leak().TheCurrent());
 
@@ -48,9 +48,11 @@ T* tls_new_class(Args&&... args)
 {
 	T* ptr = tls_new_ptr<T>();
 
+	using namespace Kernel;
+
 	if (ptr)
 	{
-		*ptr = T(NewOS::forward(args)...);
+		*ptr = T(forward(args)...);
 		return ptr;
 	}
 
@@ -66,4 +68,4 @@ inline bool tls_delete_class(T* ptr)
 {
 	ptr->~T();
 	return tls_delete_ptr(ptr);
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3