From 12f946c92dd201d4618b35a7fd92641755acbd1f Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Sun, 19 Nov 2023 00:39:52 +0100
Subject: [PATCH] Fixes to I/O registers related routines

---
 xtoskrnl/rtl/ioreg.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/xtoskrnl/rtl/ioreg.c b/xtoskrnl/rtl/ioreg.c
index e03e495..76dd0f5 100644
--- a/xtoskrnl/rtl/ioreg.c
+++ b/xtoskrnl/rtl/ioreg.c
@@ -21,9 +21,9 @@
  */
 XTAPI
 UCHAR
-RtlReadRegisterByte(IN VOLATILE PUCHAR Register)
+RtlReadRegisterByte(IN VOLATILE PVOID Register)
 {
-    return *Register;
+    return *((VOLATILE PUCHAR)Register);
 }
 
 /**
@@ -38,9 +38,9 @@ RtlReadRegisterByte(IN VOLATILE PUCHAR Register)
  */
 XTAPI
 ULONG
-RtlReadRegisterLong(IN VOLATILE PULONG Register)
+RtlReadRegisterLong(IN VOLATILE PVOID Register)
 {
-    return *Register;
+    return *((VOLATILE PULONG)Register);
 }
 
 /**
@@ -55,9 +55,9 @@ RtlReadRegisterLong(IN VOLATILE PULONG Register)
  */
 XTAPI
 USHORT
-RtlReadRegisterShort(IN VOLATILE PUSHORT Register)
+RtlReadRegisterShort(IN VOLATILE PVOID Register)
 {
-    return *Register;
+    return *((VOLATILE PUSHORT)Register);
 }
 
 /**
@@ -75,10 +75,10 @@ RtlReadRegisterShort(IN VOLATILE PUSHORT Register)
  */
 XTAPI
 VOID
-RtlWriteRegisterByte(IN PUSHORT Register,
+RtlWriteRegisterByte(IN VOLATILE PVOID Register,
                      IN UCHAR Value)
 {
-    HlIoPortOutByte((USHORT)(ULONG_PTR)Register, Value);
+    *((VOLATILE PUCHAR)Register) = Value;
 }
 
 /**
@@ -96,10 +96,10 @@ RtlWriteRegisterByte(IN PUSHORT Register,
  */
 XTAPI
 VOID
-RtlWriteRegisterLong(IN PUSHORT Register,
+RtlWriteRegisterLong(IN VOLATILE PVOID Register,
                      IN ULONG Value)
 {
-    HlIoPortOutLong((USHORT)(ULONG_PTR)Register, Value);
+    *((VOLATILE PULONG)Register) = Value;
 }
 
 /**
@@ -117,8 +117,8 @@ RtlWriteRegisterLong(IN PUSHORT Register,
  */
 XTAPI
 VOID
-RtlWriteRegisterShort(IN PUSHORT Register,
+RtlWriteRegisterShort(IN VOLATILE PVOID Register,
                       IN USHORT Value)
 {
-    HlIoPortOutShort((USHORT)(ULONG_PTR)Register, Value);
+    *((VOLATILE PUSHORT)Register) = Value;
 }