From 363421279a611fec8824d022a7ff3df1af35f913 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 30 Jan 2021 00:32:19 +1000 Subject: [PATCH] Decompile osDpGetStatus --- ld/libfiles.inc | 2 +- src/boot/entry.c | 1 - src/boot/init.c | 1 - src/boot/sched.c | 3 +-- src/include/lib/lib_48cd0.h | 8 -------- src/lib/lib_09660.c | 1 - src/lib/lib_48cd0.c | 19 ------------------- src/lib/ultra/io/dpgetstat.c | 6 ++++++ 8 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 src/include/lib/lib_48cd0.h delete mode 100644 src/lib/lib_48cd0.c create mode 100644 src/lib/ultra/io/dpgetstat.c diff --git a/ld/libfiles.inc b/ld/libfiles.inc index cbb460e75..586609fd7 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -102,7 +102,7 @@ build/ROMID/lib/ultra/os/settimer.o (section); \ build/ROMID/lib/ultra/io/sptaskyielded.o (section); \ build/ROMID/lib/ultra/io/dpctr.o (section); \ - build/ROMID/lib/lib_48cd0.o (section); \ + build/ROMID/lib/ultra/io/dpgetstat.o (section); \ build/ROMID/lib/ultra/io/viblack.o (section); \ build/ROMID/lib/ultra/io/visetmode.o (section); \ build/ROMID/lib/ultra/io/visetxscale.o (section); \ diff --git a/src/boot/entry.c b/src/boot/entry.c index ea34662dc..81d6d3d75 100644 --- a/src/boot/entry.c +++ b/src/boot/entry.c @@ -20,7 +20,6 @@ #include "lib/lib_13750.h" #include "lib/lib_2fa00.h" #include "lib/lib_48150.h" -#include "lib/lib_48cd0.h" #include "types.h" GLOBAL_ASM( diff --git a/src/boot/init.c b/src/boot/init.c index fdb3da489..1f2d7ec8a 100644 --- a/src/boot/init.c +++ b/src/boot/init.c @@ -23,7 +23,6 @@ #include "lib/lib_13750.h" #include "lib/lib_2fa00.h" #include "lib/lib_48150.h" -#include "lib/lib_48cd0.h" #include "types.h" #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/boot/sched.c b/src/boot/sched.c index 5437be996..3657ebce0 100644 --- a/src/boot/sched.c +++ b/src/boot/sched.c @@ -22,7 +22,6 @@ #include "lib/lib_13750.h" #include "lib/lib_2fa00.h" #include "lib/lib_48150.h" -#include "lib/lib_48cd0.h" #include "types.h" void func00001b10(u32 value) @@ -459,7 +458,7 @@ OSScTask *__scTaskReady(OSScTask *t) void *b; if (t) { - if ((func00048cd0() & 2) == 0) { + if ((osDpGetStatus() & DPC_STATUS_FREEZE) == 0) { if (osViGetCurrentFramebuffer() != osViGetNextFramebuffer()) { return 0; } diff --git a/src/include/lib/lib_48cd0.h b/src/include/lib/lib_48cd0.h deleted file mode 100644 index 6a21f9fc4..000000000 --- a/src/include/lib/lib_48cd0.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IN_LIB_LIB_48CD0_H -#define _IN_LIB_LIB_48CD0_H -#include -#include "types.h" - -u32 func00048cd0(void); - -#endif diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index a45eddab1..8a4304658 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -18,7 +18,6 @@ #include "lib/lib_159b0.h" #include "lib/lib_2faf0.h" #include "lib/lib_30ce0.h" -#include "lib/lib_48cd0.h" #include "lib/lib_4b170.h" #include "types.h" diff --git a/src/lib/lib_48cd0.c b/src/lib/lib_48cd0.c deleted file mode 100644 index d1653247f..000000000 --- a/src/lib/lib_48cd0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "constants.h" -#include "game/data/data_000000.h" -#include "game/data/data_0083d0.h" -#include "game/data/data_00e460.h" -#include "game/data/data_0160b0.h" -#include "game/data/data_01a3a0.h" -#include "game/data/data_020df0.h" -#include "game/data/data_02da90.h" -#include "gvars/gvars.h" -#include "types.h" - -GLOBAL_ASM( -glabel func00048cd0 -/* 48cd0: 3c0ea410 */ lui $t6,0xa410 -/* 48cd4: 03e00008 */ jr $ra -/* 48cd8: 8dc2000c */ lw $v0,0xc($t6) -/* 48cdc: 00000000 */ nop -); diff --git a/src/lib/ultra/io/dpgetstat.c b/src/lib/ultra/io/dpgetstat.c new file mode 100644 index 000000000..cc5ed1dfb --- /dev/null +++ b/src/lib/ultra/io/dpgetstat.c @@ -0,0 +1,6 @@ +#include + +u32 osDpGetStatus() +{ + return IO_READ(DPC_STATUS_REG); +}