From f9d96d9f73ac090245a518ec04f3fa0e50655d1e Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Sun, 14 Feb 2021 00:49:40 +0000
Subject: Fix most compiler warnings in the boot and code segments (#674)

* Less warnings in boot & code segments

* few more warnings gone

* Ran formatter

* z_view warning gone

* -> 1

* f31 -> 31

* Remove function casts

* Few more small improvements

* Separate declaration and assignment in func_80091738 and Item_Give

Co-authored-by: Thar0 <maximilianc64@gmail.com>
---
 src/libultra_code_O2/osContInit.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/libultra_code_O2/osContInit.c')

diff --git a/src/libultra_code_O2/osContInit.c b/src/libultra_code_O2/osContInit.c
index 8f10e854d..5b44e0112 100644
--- a/src/libultra_code_O2/osContInit.c
+++ b/src/libultra_code_O2/osContInit.c
@@ -11,6 +11,7 @@ OSMesg __osEepromTimerMsg;
 u32 gOSContInitialized = 0;
 
 #define HALF_SECOND OS_USEC_TO_CYCLES(500000)
+
 s32 osContInit(OSMesgQueue* mq, u8* ctlBitfield, OSContStatus* status) {
     OSMesg mesg;
     s32 ret = 0;
@@ -21,6 +22,7 @@ s32 osContInit(OSMesgQueue* mq, u8* ctlBitfield, OSContStatus* status) {
     if (gOSContInitialized) {
         return 0;
     }
+
     gOSContInitialized = 1;
     currentTime = osGetTime();
     if (HALF_SECOND > currentTime) {
@@ -38,6 +40,7 @@ s32 osContInit(OSMesgQueue* mq, u8* ctlBitfield, OSContStatus* status) {
     __osContLastPoll = CONT_CMD_REQUEST_STATUS;
     __osSiCreateAccessQueue();
     osCreateMesgQueue(&__osEepromTimerMsgQ, &__osEepromTimerMsg, 1);
+
     return ret;
 }
 
@@ -46,7 +49,9 @@ void __osContGetInitData(u8* ctlBitfield, OSContStatus* status) {
     __OSContRequestHeader req;
     s32 i;
     u8 bitfieldTemp = 0;
+
     bufptr = (u8*)(&__osPifInternalBuff);
+
     for (i = 0; i < __osMaxControllers; i++, bufptr += sizeof(req), status++) {
         req = *((__OSContRequestHeader*)bufptr);
         status->errno = (req.rxsize & 0xC0) >> 4;
@@ -64,12 +69,13 @@ void __osPackRequestData(u8 poll) {
     u8* bufptr;
     __OSContRequestHeader req;
     s32 i;
+
     for (i = 0; i < 0xF; i++) {
         __osPifInternalBuff.ram[i] = 0;
     }
     __osPifInternalBuff.status = 1;
 
-    bufptr = &__osPifInternalBuff;
+    bufptr = (u8*)(&__osPifInternalBuff);
 
     req.align = 0xFF;
     req.txsize = 1;
-- 
cgit v1.2.3