From 9aafa63617e1bb95e51dd63f45feea69021d9d65 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Wed, 29 Nov 2023 18:26:46 +0100
Subject: [PATCH] Move CPU and PIC support into common for i686 and amd64 place

---
 xtoskrnl/CMakeLists.txt     |  4 ++--
 xtoskrnl/hl/amd64/cpu.c     | 13 +++++++++++++
 xtoskrnl/hl/amd64/pic.c     | 13 +++++++++++++
 xtoskrnl/hl/i686/cpu.c      | 13 +++++++++++++
 xtoskrnl/hl/i686/pic.c      | 13 +++++++++++++
 xtoskrnl/hl/{ => x86}/cpu.c |  4 ++--
 xtoskrnl/hl/{ => x86}/pic.c |  4 ++--
 7 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 xtoskrnl/hl/amd64/cpu.c
 create mode 100644 xtoskrnl/hl/amd64/pic.c
 create mode 100644 xtoskrnl/hl/i686/cpu.c
 create mode 100644 xtoskrnl/hl/i686/pic.c
 rename xtoskrnl/hl/{ => x86}/cpu.c (91%)
 rename xtoskrnl/hl/{ => x86}/pic.c (97%)

diff --git a/xtoskrnl/CMakeLists.txt b/xtoskrnl/CMakeLists.txt
index d0fde8d..cdbc78b 100644
--- a/xtoskrnl/CMakeLists.txt
+++ b/xtoskrnl/CMakeLists.txt
@@ -14,10 +14,10 @@ list(APPEND XTOSKRNL_SOURCE
     ${XTOSKRNL_SOURCE_DIR}/ar/${ARCH}/traps.c
     ${XTOSKRNL_SOURCE_DIR}/ex/rundown.c
     ${XTOSKRNL_SOURCE_DIR}/hl/cport.c
-    ${XTOSKRNL_SOURCE_DIR}/hl/cpu.c
     ${XTOSKRNL_SOURCE_DIR}/hl/efifb.c
     ${XTOSKRNL_SOURCE_DIR}/hl/globals.c
-    ${XTOSKRNL_SOURCE_DIR}/hl/pic.c
+    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/cpu.c
+    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/pic.c
     ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/ioport.c
     ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/runlevel.c
     ${XTOSKRNL_SOURCE_DIR}/ke/apc.c
diff --git a/xtoskrnl/hl/amd64/cpu.c b/xtoskrnl/hl/amd64/cpu.c
new file mode 100644
index 0000000..b136254
--- /dev/null
+++ b/xtoskrnl/hl/amd64/cpu.c
@@ -0,0 +1,13 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/hl/amd64/cpu.c
+ * DESCRIPTION:     HAL AMD64 processor support
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.h>
+
+
+/* Include common CPU interface */
+#include ARCH_COMMON(cpu.c)
diff --git a/xtoskrnl/hl/amd64/pic.c b/xtoskrnl/hl/amd64/pic.c
new file mode 100644
index 0000000..60be3eb
--- /dev/null
+++ b/xtoskrnl/hl/amd64/pic.c
@@ -0,0 +1,13 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/hl/amd64/pic.c
+ * DESCRIPTION:     Programmable Interrupt Controller (PIC) for AMD64 support
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.h>
+
+
+/* Include common PIC interface */
+#include ARCH_COMMON(pic.c)
diff --git a/xtoskrnl/hl/i686/cpu.c b/xtoskrnl/hl/i686/cpu.c
new file mode 100644
index 0000000..2915cf4
--- /dev/null
+++ b/xtoskrnl/hl/i686/cpu.c
@@ -0,0 +1,13 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/hl/i686/cpu.c
+ * DESCRIPTION:     HAL i686 processor support
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.h>
+
+
+/* Include common CPU interface */
+#include ARCH_COMMON(cpu.c)
diff --git a/xtoskrnl/hl/i686/pic.c b/xtoskrnl/hl/i686/pic.c
new file mode 100644
index 0000000..120e588
--- /dev/null
+++ b/xtoskrnl/hl/i686/pic.c
@@ -0,0 +1,13 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/hl/i686/pic.c
+ * DESCRIPTION:     Programmable Interrupt Controller (PIC) for i686 support
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.h>
+
+
+/* Include common PIC interface */
+#include ARCH_COMMON(pic.c)
diff --git a/xtoskrnl/hl/cpu.c b/xtoskrnl/hl/x86/cpu.c
similarity index 91%
rename from xtoskrnl/hl/cpu.c
rename to xtoskrnl/hl/x86/cpu.c
index 7a4cf69..1afc954 100644
--- a/xtoskrnl/hl/cpu.c
+++ b/xtoskrnl/hl/x86/cpu.c
@@ -1,8 +1,8 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/hl/cpu.c
- * DESCRIPTION:     HAL Processor support
+ * FILE:            xtoskrnl/hl/x86/cpu.c
+ * DESCRIPTION:     HAL x86 (i686/AMD64) processor support
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
diff --git a/xtoskrnl/hl/pic.c b/xtoskrnl/hl/x86/pic.c
similarity index 97%
rename from xtoskrnl/hl/pic.c
rename to xtoskrnl/hl/x86/pic.c
index 1c24d62..a385b74 100644
--- a/xtoskrnl/hl/pic.c
+++ b/xtoskrnl/hl/x86/pic.c
@@ -1,8 +1,8 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/hl/pic.c
- * DESCRIPTION:     Programmable Interrupt Controller (PIC) support
+ * FILE:            xtoskrnl/hl/x86/pic.c
+ * DESCRIPTION:     Programmable Interrupt Controller (PIC) for x86 (i686/AMD64) support
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */