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 --- src/libultra_code_O2/__osContRamWrite.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libultra_code_O2/__osContRamWrite.c') diff --git a/src/libultra_code_O2/__osContRamWrite.c b/src/libultra_code_O2/__osContRamWrite.c index 4c5c16696..d65f86a19 100644 --- a/src/libultra_code_O2/__osContRamWrite.c +++ b/src/libultra_code_O2/__osContRamWrite.c @@ -15,7 +15,7 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 __osSiGetAccess(); do { - ptr = (u8*)(&pifMempakBuf); + ptr = (u8*)(&gPifMempakBuf); if (__osContLastPoll != CONT_CMD_WRITE_MEMPACK || __osPfsLastChannel != channel) { __osContLastPoll = CONT_CMD_WRITE_MEMPACK; @@ -25,7 +25,7 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 for (i = 0; i < channel; i++) { *ptr++ = 0; } // clang-format on - pifMempakBuf.status = 1; + gPifMempakBuf.status = 1; ((__OSContRamHeader*)ptr)->unk_00 = 0xff; ((__OSContRamHeader*)ptr)->txsize = 35; @@ -42,11 +42,11 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 bcopy(buffer, ((__OSContRamHeader*)ptr)->data, BLOCKSIZE); - ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf); + ret = __osSiRawStartDma(OS_WRITE, &gPifMempakBuf); crc = __osContDataCrc(buffer); osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK); - ret = __osSiRawStartDma(OS_READ, &pifMempakBuf); + ret = __osSiRawStartDma(OS_READ, &gPifMempakBuf); osRecvMesg(mq, (OSMesg*)NULL, OS_MESG_BLOCK); ret = ((((__OSContRamHeader*)ptr)->rxsize & 0xC0) >> 4); @@ -63,5 +63,6 @@ s32 __osContRamWrite(OSMesgQueue* mq, s32 channel, u16 address, u8* buffer, s32 } } while ((ret == PFS_ERR_CONTRFAIL) && (retry-- >= 0)); __osSiRelAccess(); + return ret; } -- cgit v1.2.3