mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-30 08:56:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix most compiler warnings in the boot and code segments (#674)

Browse Source 
* 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>
This commit is contained in:
Tharo
2021-02-14 00:49:40 +00:00
committed by GitHub
parent d615ec4f31
commit f9d96d9f73
208 changed files with 1702 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libultra_code_O2/__osContRamWrite.c
+5 -4
View File
@@ -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;
}