mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 02:10:57 +00:00
Code Issues 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
208 changed files with 1702 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libultra_code_O2/__osPfsGetStatus.c
View file

@ -1,7 +1,7 @@
#include "ultra64.h"
#include "global.h"
OSPifRam pifMempakBuf;
OSPifRam gPifMempakBuf;
s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel) {
s32 ret = 0;
@ -11,10 +11,10 @@ s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel) {
__osPfsInodeCacheBank = 250;
__osPfsRequestOneChannel(channel, CONT_CMD_REQUEST_STATUS);
ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf);
ret = __osSiRawStartDma(OS_WRITE, &gPifMempakBuf);
osRecvMesg(queue, &msg, OS_MESG_BLOCK);
ret = __osSiRawStartDma(OS_READ, &pifMempakBuf);
ret = __osSiRawStartDma(OS_READ, &gPifMempakBuf);
osRecvMesg(queue, &msg, OS_MESG_BLOCK);
__osPfsGetOneChannelData(channel, &data);
@ -34,10 +34,9 @@ void __osPfsRequestOneChannel(s32 channel, u8 poll) {
s32 idx;
__osContLastPoll = CONT_CMD_END;
gPifMempakBuf.status = CONT_CMD_READ_BUTTON;
pifMempakBuf.status = CONT_CMD_READ_BUTTON;
bufptr = &pifMempakBuf;
bufptr = (u8*)&gPifMempakBuf;
req.txsize = 1;
req.rxsize = 3;
@ -56,12 +55,10 @@ void __osPfsRequestOneChannel(s32 channel, u8 poll) {
}
void __osPfsGetOneChannelData(s32 channel, OSContStatus* contData) {
u8* bufptr;
u8* bufptr = (u8*)&gPifMempakBuf;
__OSContRequestHeaderAligned req;
s32 idx;
bufptr = &pifMempakBuf;
for (idx = 0; idx < channel; idx++) {
bufptr++;
}