summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2
diff options
context:
space:
mode:
authorLucas Shaw <49287729+shawlucas@users.noreply.github.com>2020-04-18 18:40:27 -0700
committerGitHub <noreply@github.com>2020-04-18 21:40:27 -0400
commit21750d5aee057f5352d945b7cad3c9394efe25b7 (patch)
tree4bd52e862a8e91fdc50dcc7a01b072ab44d6d312 /src/libultra_boot_O2
parent4961eb0a9072540ab698d032a92f8e649631935b (diff)
Naming some functions in libultra_code, decompiling a decent amount. (#77)
* osgetactivequeue ok * osspdevicebusy ok * osGetCurrFaultedThread ok * osSpRawStartDma OK * __osSpSetPc and osViGetCurrentFramebuffer OK * sinf, sins, and sptask OK * coss OK * cosf OK * ran format.sh * Updated PR to use ultratypes * osContStartQuery OK * ran format.sh * Updated PR to fix issues * Made suggested changes
Diffstat (limited to 'src/libultra_boot_O2')
-rw-r--r--src/libultra_boot_O2/__osSiDeviceBusy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libultra_boot_O2/__osSiDeviceBusy.c b/src/libultra_boot_O2/__osSiDeviceBusy.c
index 8bb777745..86833fd36 100644
--- a/src/libultra_boot_O2/__osSiDeviceBusy.c
+++ b/src/libultra_boot_O2/__osSiDeviceBusy.c
@@ -1,7 +1,7 @@
#include <global.h>
#include <ultra64/hardware.h>
-u32 __osSiDeviceBusy() {
+s32 __osSiDeviceBusy() {
register u32 status;
status = HW_REG(SI_STATUS_REG, u32);
if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) {