summaryrefslogtreecommitdiff
path: root/src/libultra_boot_O2/osCartRomInit.c
diff options
context:
space:
mode:
authorchandler <chandlerm2016@yahoo.com>2020-04-06 14:38:23 -0400
committerchandler <chandlerm2016@yahoo.com>2020-04-06 14:38:23 -0400
commit0265ad21c0fbbe799b4dc9ad46bb9681f7490f9c (patch)
tree6c2be5e8a3aad6937f200a9283256af5aef3397f /src/libultra_boot_O2/osCartRomInit.c
parent78c65878ed809282cb1923419ee30d78323368d2 (diff)
parentec5ba3ec987c826b018aec935d75bf7bddbd4a8d (diff)
merge with upstream
Diffstat (limited to 'src/libultra_boot_O2/osCartRomInit.c')
-rw-r--r--src/libultra_boot_O2/osCartRomInit.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libultra_boot_O2/osCartRomInit.c b/src/libultra_boot_O2/osCartRomInit.c
index 5492a61f5..eef5be9fd 100644
--- a/src/libultra_boot_O2/osCartRomInit.c
+++ b/src/libultra_boot_O2/osCartRomInit.c
@@ -3,8 +3,7 @@
OSPiHandle __CartRomHandle;
-OSPiHandle* osCartRomInit()
-{
+OSPiHandle* osCartRomInit() {
register u32 a;
register s32 status;
register u32 prevInt;
@@ -17,8 +16,7 @@ OSPiHandle* osCartRomInit()
__osPiGetAccess();
- if (!D_8000AF10)
- {
+ if (!D_8000AF10) {
__osPiRelAccess();
return &__CartRomHandle;
}
@@ -30,8 +28,9 @@ OSPiHandle* osCartRomInit()
__CartRomHandle.speed = 0;
bzero(&__CartRomHandle.transferInfo, sizeof(__OSTranxInfo));
- while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR)
+ while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR) {
;
+ }
lastLatency = HW_REG(PI_BSD_DOM1_LAT_REG, u32);
lastPageSize = HW_REG(PI_BSD_DOM1_PGS_REG, u32);