summaryrefslogtreecommitdiff
path: root/src/libultra_code_O2/osContStartReadData.c
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2021-02-14 00:49:40 +0000
committerGitHub <noreply@github.com>2021-02-13 19:49:40 -0500
commitf9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch)
tree9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/libultra_code_O2/osContStartReadData.c
parentd615ec4f31563b939f8c0dce1c20c79e137c2043 (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/osContStartReadData.c')
-rw-r--r--src/libultra_code_O2/osContStartReadData.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libultra_code_O2/osContStartReadData.c b/src/libultra_code_O2/osContStartReadData.c
index 59ead072c..a85a3337b 100644
--- a/src/libultra_code_O2/osContStartReadData.c
+++ b/src/libultra_code_O2/osContStartReadData.c
@@ -2,6 +2,7 @@
s32 osContStartReadData(OSMesgQueue* mq) {
s32 ret;
+
__osSiGetAccess();
if (__osContLastPoll != 1) {
__osPackReadData();
@@ -15,10 +16,10 @@ s32 osContStartReadData(OSMesgQueue* mq) {
}
void osContGetReadData(OSContPad* contData) {
- u8* bufptr;
+ u8* bufptr = (u8*)(&__osPifInternalBuff);
__OSContReadHeader read;
s32 i;
- bufptr = (u8*)(&__osPifInternalBuff);
+
for (i = 0; i < __osMaxControllers; i++, bufptr += sizeof(read), contData++) {
read = *((__OSContReadHeader*)bufptr);
contData->errno = (read.rxsize & 0xC0) >> 4;
@@ -30,11 +31,11 @@ void osContGetReadData(OSContPad* contData) {
};
}
-void __osPackReadData() {
- u8* bufptr;
+void __osPackReadData(void) {
+ u8* bufptr = (u8*)(&__osPifInternalBuff);
__OSContReadHeader read;
s32 i;
- bufptr = (u8*)(&__osPifInternalBuff);
+
for (i = 0; i < 0xF; i++) {
__osPifInternalBuff.ram[i] = 0;
}