From d55946c3cf337db3f686d7c30dbcb31c3a3a57ec Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Sat, 28 Oct 2023 22:56:04 +0200
Subject: [PATCH] Cleanup HL subsystem headers

---
 sdk/xtdk/hlfuncs.h       | 28 +--------------------------
 xtoskrnl/includes/hl.h   | 41 ++++++++++++++++++++++++++++++++++++++++
 xtoskrnl/includes/xtos.h |  1 +
 3 files changed, 43 insertions(+), 27 deletions(-)
 create mode 100644 xtoskrnl/includes/hl.h

diff --git a/sdk/xtdk/hlfuncs.h b/sdk/xtdk/hlfuncs.h
index 1939845..c7286d8 100644
--- a/sdk/xtdk/hlfuncs.h
+++ b/sdk/xtdk/hlfuncs.h
@@ -14,34 +14,12 @@
 #include <xttypes.h>
 
 
-/* HAL library routines forward references */
-XTAPI
-VOID
-HlClearScreen(VOID);
-
-XTCDECL
-XTSTATUS
-HlComPortGetByte(IN PCPPORT Port,
-                 OUT PUCHAR Byte,
-                 IN BOOLEAN Wait,
-                 IN BOOLEAN Poll);
-
+/* Routines used by XTLDR */
 XTCDECL
 XTSTATUS
 HlComPortPutByte(IN PCPPORT Port,
                  IN UCHAR Byte);
 
-XTCDECL
-UCHAR
-HlComPortReadLsr(IN PCPPORT Port,
-                 IN UCHAR Byte);
-
-XTAPI
-VOID
-HlDrawPixel(IN ULONG PosX,
-            IN ULONG PosY,
-            IN ULONG Color);
-
 XTCDECL
 XTSTATUS
 HlInitializeComPort(IN OUT PCPPORT Port,
@@ -49,8 +27,4 @@ HlInitializeComPort(IN OUT PCPPORT Port,
                     IN PUCHAR PortAddress,
                     IN ULONG BaudRate);
 
-XTAPI
-XTSTATUS
-HlInitializeDisplay(VOID);
-
 #endif /* __XTDK_HLFUNCS_H */
diff --git a/xtoskrnl/includes/hl.h b/xtoskrnl/includes/hl.h
new file mode 100644
index 0000000..5787ed9
--- /dev/null
+++ b/xtoskrnl/includes/hl.h
@@ -0,0 +1,41 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/includes/hl.h
+ * DESCRIPTION:     Private routine definitions for hardware abstraction layer
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTOSKRNL_HL_H
+#define __XTOSKRNL_HL_H
+
+#include <xtos.h>
+
+
+XTAPI
+VOID
+HlClearScreen(VOID);
+
+XTCDECL
+XTSTATUS
+HlComPortGetByte(IN PCPPORT Port,
+                 OUT PUCHAR Byte,
+                 IN BOOLEAN Wait,
+                 IN BOOLEAN Poll);
+
+XTCDECL
+UCHAR
+HlComPortReadLsr(IN PCPPORT Port,
+                 IN UCHAR Byte);
+
+XTAPI
+VOID
+HlDrawPixel(IN ULONG PosX,
+            IN ULONG PosY,
+            IN ULONG Color);
+
+XTAPI
+XTSTATUS
+HlInitializeDisplay(VOID);
+
+#endif /* __XTOSKRNL_HL_H */
diff --git a/xtoskrnl/includes/xtos.h b/xtoskrnl/includes/xtos.h
index 4d57576..1e864ac 100644
--- a/xtoskrnl/includes/xtos.h
+++ b/xtoskrnl/includes/xtos.h
@@ -15,6 +15,7 @@
 /* Kernel specific headers */
 #include "globals.h"
 #include "ar.h"
+#include "hl.h"
 #include "ke.h"
 #include "po.h"