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/__osViInit.c | |
| parent | 2c7a339a81ddb3698bac0a3bb4238dd3e65d34ce (diff) | |
| parent | 4eb7f023f348151fb73f4a0850a6f348280d7805 (diff) | |
Bring up to master.
Diffstat (limited to 'src/libultra_boot_O2/__osViInit.c')
| -rw-r--r-- | src/libultra_boot_O2/__osViInit.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libultra_boot_O2/__osViInit.c b/src/libultra_boot_O2/__osViInit.c index a660a1de2..becce34ab 100644 --- a/src/libultra_boot_O2/__osViInit.c +++ b/src/libultra_boot_O2/__osViInit.c @@ -1,12 +1,11 @@ #include <global.h> #include <ultra64/hardware.h> -OSViContext vi[2] = {0}; +OSViContext vi[2] = { 0 }; OSViContext* __osViCurr = &vi[0]; OSViContext* __osViNext = &vi[1]; -void __osViInit() -{ +void __osViInit() { bzero(vi, sizeof(vi)); __osViCurr = &vi[0]; __osViNext = &vi[1]; @@ -15,19 +14,21 @@ void __osViInit() __osViCurr->retraceCount = 1; __osViNext->buffer = (void*)0x80000000; __osViCurr->buffer = (void*)0x80000000; - - if (osTvType == 0) + + if (osTvType == 0) { __osViNext->modep = &osViModePalLan1; - else if (osTvType == 2) + } else if (osTvType == 2) { __osViNext->modep = &osViModeMpalLan1; - else + } else { __osViNext->modep = &osViModeNtscLan1; + } __osViNext->state = 0x20; __osViNext->features = __osViNext->modep->comRegs.ctrl; - while (HW_REG(VI_CURRENT_REG, u32) > 10) + while (HW_REG(VI_CURRENT_REG, u32) > 10) { ; + } HW_REG(VI_CONTROL_REG, u32) = 0; __osViSwapContext(); |
