diff options
| author | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
|---|---|---|
| committer | Lucas Shaw <lgs84@cornell.edu> | 2020-03-22 22:57:24 -0700 |
| commit | 6a45dcba7f382a357a016dc295beba58398079e4 (patch) | |
| tree | f6cd3be8ec3b662c5acaaeaecf0f4d8c4056d024 /src/libultra_boot_O2/osCartRomInit.c | |
| parent | 62e7a8c0376666f7ab8ca49e44eb831d6232d61e (diff) | |
| parent | d879f2acb02924b75552487db291fa3e0397d86c (diff) | |
Fixed merge conflict
Diffstat (limited to 'src/libultra_boot_O2/osCartRomInit.c')
| -rw-r--r-- | src/libultra_boot_O2/osCartRomInit.c | 9 |
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); |