From 17ea9ed598db10845a6197e669a7bcad4119582d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 26 Jan 2021 19:48:58 +1000 Subject: [PATCH] Decompile __osSpSetStatus --- ld/libfiles.inc | 2 +- src/include/lib/lib_4b500.h | 6 ------ src/lib/lib_05e40.c | 1 - src/lib/lib_490b0.c | 1 - src/lib/lib_4b500.c | 23 +++++------------------ src/lib/ultra/io/spsetstat.c | 6 ++++++ 6 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 src/include/lib/lib_4b500.h create mode 100644 src/lib/ultra/io/spsetstat.c diff --git a/ld/libfiles.inc b/ld/libfiles.inc index 6903837e1..602a48352 100644 --- a/ld/libfiles.inc +++ b/ld/libfiles.inc @@ -132,7 +132,7 @@ build/ROMID/lib/ultra/os/getcause.o (section); \ build/ROMID/lib/lib_4b170.o (section); \ build/ROMID/lib/ultra/os/virtualtophysical.o (section); \ - build/ROMID/lib/lib_4b500.o (section); \ + build/ROMID/lib/ultra/io/spsetstat.o (section); \ build/ROMID/lib/ultra/io/spsetpc.o (section); \ build/ROMID/lib/lib_4b550.o (section); \ build/ROMID/lib/lib_4b5e0.o (section); \ diff --git a/src/include/lib/lib_4b500.h b/src/include/lib/lib_4b500.h deleted file mode 100644 index 7adbef466..000000000 --- a/src/include/lib/lib_4b500.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _IN_LIB_LIB_4B500_H -#define _IN_LIB_LIB_4B500_H -#include -#include "types.h" - -#endif diff --git a/src/lib/lib_05e40.c b/src/lib/lib_05e40.c index f1fbfdd5b..f90d91fa3 100644 --- a/src/lib/lib_05e40.c +++ b/src/lib/lib_05e40.c @@ -10,7 +10,6 @@ #include "gvars/gvars.h" #include "lib/lib_05e40.h" #include "lib/lib_4b170.h" -#include "lib/lib_4b500.h" #include "lib/lib_4b550.h" #include "lib/lib_4b5e0.h" #include "types.h" diff --git a/src/lib/lib_490b0.c b/src/lib/lib_490b0.c index c6069c30a..9e415bdef 100644 --- a/src/lib/lib_490b0.c +++ b/src/lib/lib_490b0.c @@ -8,7 +8,6 @@ #include "game/data/data_020df0.h" #include "game/data/data_02da90.h" #include "gvars/gvars.h" -#include "lib/lib_4b500.h" #include "types.h" GLOBAL_ASM( diff --git a/src/lib/lib_4b500.c b/src/lib/lib_4b500.c index 0711d276e..f0e2380e8 100644 --- a/src/lib/lib_4b500.c +++ b/src/lib/lib_4b500.c @@ -1,19 +1,6 @@ -#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" +#include "libultra_internal.h" -GLOBAL_ASM( -glabel __osSpSetStatus -/* 4b500: 3c0ea404 */ lui $t6,0xa404 -/* 4b504: 03e00008 */ jr $ra -/* 4b508: adc40010 */ sw $a0,0x10($t6) -/* 4b50c: 00000000 */ nop -); +void __osSpSetStatus(u32 data) +{ + IO_WRITE(SP_STATUS_REG, data); +} diff --git a/src/lib/ultra/io/spsetstat.c b/src/lib/ultra/io/spsetstat.c new file mode 100644 index 000000000..f0e2380e8 --- /dev/null +++ b/src/lib/ultra/io/spsetstat.c @@ -0,0 +1,6 @@ +#include "libultra_internal.h" + +void __osSpSetStatus(u32 data) +{ + IO_WRITE(SP_STATUS_REG, data); +}