summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2/__osSiDeviceBusy.c
diff options
context:
space:
mode:
authorshawlucas <lgs84@cornell.edu>2020-03-23 14:41:50 -0700
committershawlucas <lgs84@cornell.edu>2020-03-23 14:41:50 -0700
commit09afb8d5528118e287d3b126dd9f8a4e803b5ea7 (patch)
tree9763c68b8511f23f7801939cac736bf96a502d54 /src/libultra_boot_O2/__osSiDeviceBusy.c
parent2d97f0dd58dc3b3aaecc99010716f2ce21b9eed5 (diff)
parent8e316933d596204aa42fcfc2587fee480b4e114e (diff)
Merge branch 'master' of https://github.com/zeldaret/oot
Diffstat (limited to 'src/libultra_boot_O2/__osSiDeviceBusy.c')
-rw-r--r--src/libultra_boot_O2/__osSiDeviceBusy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libultra_boot_O2/__osSiDeviceBusy.c b/src/libultra_boot_O2/__osSiDeviceBusy.c
index 983bd071d..8bb777745 100644
--- a/src/libultra_boot_O2/__osSiDeviceBusy.c
+++ b/src/libultra_boot_O2/__osSiDeviceBusy.c
@@ -1,12 +1,12 @@
#include <global.h>
#include <ultra64/hardware.h>
-u32 __osSiDeviceBusy()
-{
+u32 __osSiDeviceBusy() {
register u32 status;
status = HW_REG(SI_STATUS_REG, u32);
- if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY))
+ if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) {
return true;
- else
+ } else {
return false;
+ }
}