merge with upstream

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();