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; +}