From 56a73132f8839394f6fe2b971aa3161836fcb3f8 Mon Sep 17 00:00:00 2001
From: Jozef Nagy <schkwve@gmail.com>
Date: Sun, 26 Nov 2023 13:11:09 +0100
Subject: [PATCH] Removed HlIoPortWait() routine declaration from XTDK

---
 sdk/xtdk/amd64/hlfuncs.h     |  4 ----
 sdk/xtdk/i686/hlfuncs.h      |  4 ----
 xtoskrnl/includes/amd64/hl.h | 18 ++++++++++++++++++
 xtoskrnl/includes/i686/hl.h  | 18 ++++++++++++++++++
 xtoskrnl/includes/xtos.h     |  1 +
 5 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 xtoskrnl/includes/amd64/hl.h
 create mode 100644 xtoskrnl/includes/i686/hl.h

diff --git a/sdk/xtdk/amd64/hlfuncs.h b/sdk/xtdk/amd64/hlfuncs.h
index e615724..d5d6bff 100644
--- a/sdk/xtdk/amd64/hlfuncs.h
+++ b/sdk/xtdk/amd64/hlfuncs.h
@@ -43,8 +43,4 @@ VOID
 HlIoPortOutShort(IN USHORT Port,
                  IN USHORT Value);
 
-XTCDECL
-VOID
-HlIoPortWait(VOID);
-
 #endif /* __XTDK_AMD64_HLFUNCS_H */
diff --git a/sdk/xtdk/i686/hlfuncs.h b/sdk/xtdk/i686/hlfuncs.h
index 24c6746..dfc35ac 100644
--- a/sdk/xtdk/i686/hlfuncs.h
+++ b/sdk/xtdk/i686/hlfuncs.h
@@ -43,8 +43,4 @@ VOID
 HlIoPortOutShort(IN USHORT Port,
                  IN USHORT Value);
 
-XTCDECL
-VOID
-HlIoPortWait(VOID);
-
 #endif /* __XTDK_I686_HLFUNCS_H */
diff --git a/xtoskrnl/includes/amd64/hl.h b/xtoskrnl/includes/amd64/hl.h
new file mode 100644
index 0000000..71ed2d4
--- /dev/null
+++ b/xtoskrnl/includes/amd64/hl.h
@@ -0,0 +1,18 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/amd64/hl.h
+ * DESCRIPTION:     AMD64 hardware abstraction layer routines
+ * DEVELOPERS:      Jozef Nagy <schkwve@gmail.com>
+ */
+
+#ifndef __XTOSKRNL_AMD64_HL_H
+#define __XTOSKRNL_AMD64_HL_H
+
+#include <xtos.h>
+
+XTCDECL
+VOID
+HlIoPortWait(VOID);
+
+#endif /* __XTOSKRNL_AMD64_HL_H */
diff --git a/xtoskrnl/includes/i686/hl.h b/xtoskrnl/includes/i686/hl.h
new file mode 100644
index 0000000..600e620
--- /dev/null
+++ b/xtoskrnl/includes/i686/hl.h
@@ -0,0 +1,18 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/i686/hl.h
+ * DESCRIPTION:     I686 hardware abstraction layer routines
+ * DEVELOPERS:      Jozef Nagy <schkwve@gmail.com>
+ */
+
+#ifndef __XTOSKRNL_I686_HL_H
+#define __XTOSKRNL_I686_HL_H
+
+#include <xtos.h>
+
+XTCDECL
+VOID
+HlIoPortWait(VOID);
+
+#endif /* __XTOSKRNL_I686_HL_H */
diff --git a/xtoskrnl/includes/xtos.h b/xtoskrnl/includes/xtos.h
index ee2a309..df42c82 100644
--- a/xtoskrnl/includes/xtos.h
+++ b/xtoskrnl/includes/xtos.h
@@ -22,6 +22,7 @@
 
 #include ARCH_HEADER(globals.h)
 #include ARCH_HEADER(ar.h)
+#include ARCH_HEADER(hl.h)
 #include ARCH_HEADER(ke.h)
 #include ARCH_HEADER(mm.h)
 #include ARCH_HEADER(rtl.h)