diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/libultra_code_O2/__osPfsGetStatus.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
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>
Diffstat (limited to 'src/libultra_code_O2/__osPfsGetStatus.c')
| -rw-r--r-- | src/libultra_code_O2/__osPfsGetStatus.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libultra_code_O2/__osPfsGetStatus.c b/src/libultra_code_O2/__osPfsGetStatus.c index aa2b8a6ff..3a1e962a2 100644 --- a/src/libultra_code_O2/__osPfsGetStatus.c +++ b/src/libultra_code_O2/__osPfsGetStatus.c @@ -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++; } |