diff options
| author | Ethan Roseman <ethteck@gmail.com> | 2020-03-22 19:21:39 -0400 |
|---|---|---|
| committer | Ethan Roseman <ethteck@gmail.com> | 2020-03-22 19:21:39 -0400 |
| commit | ab976edca4f09dc017a7672596b232e6d2a98e07 (patch) | |
| tree | ce030691b1e00c2e224a0680033834e7043129de /src/libultra_boot_O2/__osSiDeviceBusy.c | |
| parent | 0f7cc04f430f0b98b98e51de08a94f2c326ba36e (diff) | |
| parent | d85168f0b088c8e5f661725f45946ca10cc82956 (diff) | |
Merge branch 'master' into ovl_Bg_Gate_Shutter
Diffstat (limited to 'src/libultra_boot_O2/__osSiDeviceBusy.c')
| -rw-r--r-- | src/libultra_boot_O2/__osSiDeviceBusy.c | 8 |
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; + } } |