summaryrefslogtreecommitdiff
path: root/src/libultra_code/osContStartReadData.c
diff options
context:
space:
mode:
authorsilv3rwing07 <62714207+silv3rwing07@users.noreply.github.com>2020-04-14 10:17:25 -0700
committerGitHub <noreply@github.com>2020-04-14 13:17:25 -0400
commit5aef81071e501fbbe5298a433ead06a625cdb3d8 (patch)
tree686ccf568a7f05bd7741be96cd22f51d358451d4 /src/libultra_code/osContStartReadData.c
parent16646aa34d533b36e3a93985ae59cbefdf58b6d4 (diff)
padmgr and related (#71)
* In process of moving changes over from old repo * Merged in changes * Finished import of padmgr changes from old repo * Adjusted some volatile * Improving padmgr volatile situation * Almost matched osReadMempak * Working on osMempakDataCRC * Explanations and equivalents but no matches for osMempakAddrCRC and osMempakDataCRC * OK after merge * Matched osMempakAddrCRC and osMempakDataCRC * Matched osReadMempak * Updated PadMgr function names to be less like original code * Changed variable names to make them further from original code * Changed names and it stopped matching * Undid clang-format steamrollering whitespace memes * Cleaned up Input names * More formatting changes * Moved padmgr to z64.h, deleted padmgr.h
Diffstat (limited to 'src/libultra_code/osContStartReadData.c')
-rw-r--r--src/libultra_code/osContStartReadData.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libultra_code/osContStartReadData.c b/src/libultra_code/osContStartReadData.c
index 9bd0bfbd2..60e415028 100644
--- a/src/libultra_code/osContStartReadData.c
+++ b/src/libultra_code/osContStartReadData.c
@@ -26,9 +26,9 @@ void osContGetReadData(OSContPad* pad) {
slot = *slot_ptr;
pad->errno = (slot.hdr.status_hi_bytes_rec_lo & 0xc0) >> 4;
if (pad->errno == 0) {
- pad->button = slot.button;
- pad->stick_x = slot.rawStickX;
- pad->stick_y = slot.rawStickY;
+ pad->button = slot.input.button;
+ pad->stick_x = slot.input.x;
+ pad->stick_y = slot.input.y;
}
};
}
@@ -46,9 +46,9 @@ void __osPackReadData() {
slot.hdr.bytes_send = 1;
slot.hdr.status_hi_bytes_rec_lo = 4;
slot.hdr.command = 1;
- slot.button = 0xFFFF;
- slot.rawStickX = 0xFF;
- slot.rawStickY = 0xFF;
+ slot.input.button = 0xFFFF;
+ slot.input.x = 0xFF;
+ slot.input.y = 0xFF;
for (i = 0; i < _osCont_numControllers; i++) {
*slot_ptr++ = slot;
}