Refresh 10

This commit is contained in:
n64
2020-06-02 12:44:34 -04:00
parent 749df0d2ed
commit df7897da28
444 changed files with 30163 additions and 7628 deletions
+36 -36
View File
@@ -3,71 +3,71 @@
#include <macros.h>
#ifndef AVOID_UB
OSContPackedStruct D_80365CE0[7];
ALIGNED8 OSContPackedStruct _osContCmdBuf[7];
UNUSED static u32 unused; // padding between these two variables
u32 D_80365D1C;
u32 _osContPifCtrl;
#else
// Reordered gcc vars above will disturb the aliasing done to access all 8 members of this array, hence AVOID_UB.
OSContPackedStruct D_80365CE0[8];
ALIGNED8 OSContPackedStruct _osContCmdBuf[8];
#endif
extern u8 D_80365D20;
extern u8 _osCont_numControllers;
extern u8 _osLastSentSiCmd;
extern u8 _osContNumControllers;
void __osPackReadData(void);
s32 osContStartReadData(OSMesgQueue *mesg) {
s32 ret = 0;
s32 i;
__osSiGetAccess();
if (D_80365D20 != 1) {
if (_osLastSentSiCmd != 1) {
__osPackReadData();
ret = __osSiRawStartDma(1, D_80365CE0);
ret = __osSiRawStartDma(OS_WRITE, _osContCmdBuf);
osRecvMesg(mesg, NULL, OS_MESG_BLOCK);
}
for (i = 0; i < 0x10; i++) {
*((u32 *) &D_80365CE0 + i) = 255;
*((u32 *) &_osContCmdBuf + i) = 255;
}
D_80365D1C = 0;
ret = __osSiRawStartDma(0, &D_80365CE0);
D_80365D20 = 1;
_osContPifCtrl = 0;
ret = __osSiRawStartDma(OS_READ, _osContCmdBuf);
_osLastSentSiCmd = 1;
__osSiRelAccess();
return ret;
}
void osContGetReadData(OSContPad *pad) {
OSContPackedRead *spc;
OSContPackedRead sp4;
OSContPackedRead *cmdBufPtr;
OSContPackedRead response;
s32 i;
spc = &D_80365CE0[0].read;
for (i = 0; i < _osCont_numControllers; i++, spc++, pad++) {
sp4 = *spc;
pad->errno = (sp4.unk02 & 0xc0) >> 4;
if (pad->errno == 0) {
pad->button = sp4.button;
pad->stick_x = sp4.rawStickX;
pad->stick_y = sp4.rawStickY;
cmdBufPtr = &_osContCmdBuf[0].read;
for (i = 0; i < _osContNumControllers; i++, cmdBufPtr++, pad++) {
response = *cmdBufPtr;
pad->errnum = (response.rxLen & 0xc0) >> 4;
if (pad->errnum == 0) {
pad->button = response.button;
pad->stick_x = response.rawStickX;
pad->stick_y = response.rawStickY;
}
};
}
void __osPackReadData() {
OSContPackedRead *spc;
OSContPackedRead sp4;
OSContPackedRead *cmdBufPtr;
OSContPackedRead request;
s32 i;
spc = &D_80365CE0[0].read;
cmdBufPtr = &_osContCmdBuf[0].read;
for (i = 0; i < 0x10; i++) {
*((u32 *) &D_80365CE0 + i) = 0;
*((u32 *) &_osContCmdBuf + i) = 0;
}
D_80365D1C = 1;
sp4.unk00 = 255;
sp4.unk01 = 1;
sp4.unk02 = 4;
sp4.unk03 = 1;
sp4.button = 65535;
sp4.rawStickX = -1;
sp4.rawStickY = -1;
for (i = 0; i < _osCont_numControllers; i++) {
*spc++ = sp4;
_osContPifCtrl = 1;
request.padOrEnd = 255;
request.txLen = 1;
request.rxLen = 4;
request.command = 1;
request.button = 65535;
request.rawStickX = -1;
request.rawStickY = -1;
for (i = 0; i < _osContNumControllers; i++) {
*cmdBufPtr++ = request;
}
spc->unk00 = 254;
cmdBufPtr->padOrEnd = 254;
}