From 9aef02bc329305dbdcb2729e974bb96035585ad4 Mon Sep 17 00:00:00 2001
From: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Date: Thu, 11 Nov 2021 22:27:49 +0000
Subject: [PATCH] epiread.c OK (#410)

* epiread.c OK

* uintptr_t
---
 src/libultra/io/epirawread.c |  2 +-
 src/libultra/io/epiread.c    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libultra/io/epirawread.c b/src/libultra/io/epirawread.c
index 317f7d63ec..df0c6b603b 100644
--- a/src/libultra/io/epirawread.c
+++ b/src/libultra/io/epirawread.c
@@ -1,6 +1,6 @@
 #include "global.h"
 
-s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) {
+s32 __osEPiRawReadIo(OSPiHandle* handle, uintptr_t devAddr, u32* data) {
     s32 status;
     OSPiHandle* curHandle;
 
diff --git a/src/libultra/io/epiread.c b/src/libultra/io/epiread.c
index efab23bbb3..5a2205bdc5 100644
--- a/src/libultra/io/epiread.c
+++ b/src/libultra/io/epiread.c
@@ -1,3 +1,11 @@
 #include "global.h"
 
-#pragma GLOBAL_ASM("asm/non_matchings/boot/epiread/osEPiReadIo.s")
+s32 osEPiReadIo(OSPiHandle* handle, uintptr_t devAddr, u32* data) {
+    register s32 ret;
+
+    __osPiGetAccess();
+    ret = __osEPiRawReadIo(handle, devAddr, data);
+    __osPiRelAccess();
+
+    return ret;
+}