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/osPfsIsPlug.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/osPfsIsPlug.c')
| -rw-r--r-- | src/libultra_code_O2/osPfsIsPlug.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libultra_code_O2/osPfsIsPlug.c b/src/libultra_code_O2/osPfsIsPlug.c index 329610ac5..a1b73cf8e 100644 --- a/src/libultra_code_O2/osPfsIsPlug.c +++ b/src/libultra_code_O2/osPfsIsPlug.c @@ -15,10 +15,10 @@ s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern) { do { __osPfsRequestData(CONT_CMD_REQUEST_STATUS); - ret = __osSiRawStartDma(OS_WRITE, &pifMempakBuf); + ret = __osSiRawStartDma(OS_WRITE, &gPifMempakBuf); osRecvMesg(mq, &msg, OS_MESG_BLOCK); - ret = __osSiRawStartDma(OS_READ, &pifMempakBuf); + ret = __osSiRawStartDma(OS_READ, &gPifMempakBuf); osRecvMesg(mq, &msg, OS_MESG_BLOCK); __osPfsGetInitData(&bitpattern, &contData[0]); @@ -45,13 +45,13 @@ s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern) { } void __osPfsRequestData(u8 poll) { - u8* bufPtr = &pifMempakBuf; + u8* bufPtr = (u8*)&gPifMempakBuf; __OSContRequestHeader req; s32 i; __osContLastPoll = poll; - pifMempakBuf.status = 1; + gPifMempakBuf.status = 1; req.align = 0xFF; req.txsize = 1; @@ -75,7 +75,7 @@ void __osPfsGetInitData(u8* pattern, OSContStatus* contData) { s32 i; u8 bits = 0; - bufptr = &pifMempakBuf; + bufptr = (u8*)&gPifMempakBuf; for (i = 0; i < __osMaxControllers; i++, bufptr += sizeof(req), contData++) { req = *((__OSContRequestHeader*)bufptr); |