diff options
| author | JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> | 2020-03-24 14:38:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 14:38:55 -0400 |
| commit | 234b954473e05009326b017b34e7a2bbe77a3de1 (patch) | |
| tree | 3cbbac4cc24bf81c4a35fe270ba8fddc993f23bf /src/libultra_boot_O2/osDriveRomInit.c | |
| parent | 2c7a339a81ddb3698bac0a3bb4238dd3e65d34ce (diff) | |
| parent | 4eb7f023f348151fb73f4a0850a6f348280d7805 (diff) | |
Bring up to master.
Diffstat (limited to 'src/libultra_boot_O2/osDriveRomInit.c')
| -rw-r--r-- | src/libultra_boot_O2/osDriveRomInit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libultra_boot_O2/osDriveRomInit.c b/src/libultra_boot_O2/osDriveRomInit.c index 2428161e8..4dd49a629 100644 --- a/src/libultra_boot_O2/osDriveRomInit.c +++ b/src/libultra_boot_O2/osDriveRomInit.c @@ -3,8 +3,7 @@ OSPiHandle __DriveRomHandle; -OSPiHandle* osDriveRomInit() -{ +OSPiHandle* osDriveRomInit() { register s32 status; register u32 a; register s32 prevInt; @@ -12,8 +11,7 @@ OSPiHandle* osDriveRomInit() __osPiGetAccess(); - if (!D_8000AC70) - { + if (!D_8000AC70) { __osPiRelAccess(); return &__DriveRomHandle; } @@ -25,8 +23,9 @@ OSPiHandle* osDriveRomInit() __DriveRomHandle.speed = 0; bzero(&__DriveRomHandle.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) { ; + } HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xff; HW_REG(PI_BSD_DOM1_PGS_REG, u32) = 0; |