joel16/uofw
1
0
Fork 0
mirror of https://github.com/joel16/uofw.git synced 2025-02-21 11:22:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/ctrl: Applied member clarification introduced in f099b78dc0937df4e7346e2e417b63f471f8a3af to actual module code.

Browse Source
This commit is contained in:
Felix-Dev 2018-10-27 08:26:11 +02:00
parent d13e3b9f68
commit 1e15137d38
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ctrl.h
View File

@ -703,10 +703,10 @@ s32 sceCtrlSetButtonEmulation(u8 slot, u32 userButtons, u32 kernelButtons, u32 u
/**
* Get the button mask settings applied to PSP buttons.
*
*
* @param buttons The buttons to check for. One or more buttons of ::SceCtrlPadButtons.
*
* @return The button mask mode for the given buttons. One of ::SceCtrlPadButtonMaskMode.
*
* @return The button mask mode for the given buttons. One of ::SceCtrlPadButtonMaskMode.
*/
u32 sceCtrlGetButtonIntercept(u32 buttons);

72
src/ctrl/ctrl.c
View File

@ -1628,14 +1628,14 @@ static s32 _sceCtrlUpdateButtons(u32 rawButtons, u8 aX, u8 aY)
ctrlKernelBufExt->timeStamp = 0;
ctrlKernelBufExt->buttons = 0;
ctrlKernelBufExt->unk1 = 0;
ctrlKernelBufExt->unk2 = 0;
ctrlKernelBufExt->unk3 = 0;
ctrlKernelBufExt->unk4 = 0;
ctrlKernelBufExt->unk5 = 0;
ctrlKernelBufExt->unk6 = 0;
ctrlKernelBufExt->unk7 = 0;
ctrlKernelBufExt->unk8 = 0;
ctrlKernelBufExt->DPadSenseA = 0;
ctrlKernelBufExt->DPadSenseB = 0;
ctrlKernelBufExt->GPadSenseA = 0;
ctrlKernelBufExt->GPadSenseB = 0;
ctrlKernelBufExt->AxisSenseA = 0;
ctrlKernelBufExt->AxisSenseB = 0;
ctrlKernelBufExt->TiltA = 0;
ctrlKernelBufExt->TiltB = 0;
ctrlKernelBufExt->aX = CTRL_ANALOG_PAD_CENTER_VALUE;
ctrlKernelBufExt->aY = CTRL_ANALOG_PAD_CENTER_VALUE;
ctrlKernelBufExt->rsrv[0] = -128;
@ -1694,14 +1694,14 @@ static s32 _sceCtrlUpdateButtons(u32 rawButtons, u8 aX, u8 aY)
for (j = 0; j < sizeof ctrlUserBufExt->rsrv; j++)
ctrlUserBufExt->rsrv[j] = ctrlKernelBufExt->rsrv[j];
ctrlUserBufExt->unk1 = ctrlKernelBufExt->unk1;
ctrlUserBufExt->unk2 = ctrlKernelBufExt->unk2;
ctrlUserBufExt->unk3 = ctrlKernelBufExt->unk3;
ctrlUserBufExt->unk4 = ctrlKernelBufExt->unk4;
ctrlUserBufExt->unk5 = ctrlKernelBufExt->unk5;
ctrlUserBufExt->unk6 = ctrlKernelBufExt->unk6;
ctrlUserBufExt->unk7 = ctrlKernelBufExt->unk7;
ctrlUserBufExt->unk8 = ctrlKernelBufExt->unk8;
ctrlUserBufExt->DPadSenseA = ctrlKernelBufExt->DPadSenseA;
ctrlUserBufExt->DPadSenseB = ctrlKernelBufExt->DPadSenseB;
ctrlUserBufExt->GPadSenseA = ctrlKernelBufExt->GPadSenseA;
ctrlUserBufExt->GPadSenseB = ctrlKernelBufExt->GPadSenseB;
ctrlUserBufExt->AxisSenseA = ctrlKernelBufExt->AxisSenseA;
ctrlUserBufExt->AxisSenseB = ctrlKernelBufExt->AxisSenseB;
ctrlUserBufExt->TiltA = ctrlKernelBufExt->TiltA;
ctrlUserBufExt->TiltB = ctrlKernelBufExt->TiltB;
ctrlUserBufExt->buttons &= ~SCE_CTRL_INTERCEPTED;
ctrlUserBufExt->buttons &= g_ctrl.maskSupportButtons;
@ -2083,30 +2083,30 @@ static s32 _sceCtrlReadBuf(SceCtrlDataExt *data, u8 nBufs, u32 inputMode, u8 mod
if (inputMode == SCE_CTRL_EXTERNAL_INPUT_PSP) {
data->rsrv[0] = -128;
data->rsrv[1] = -128;
data->rsrv[4] = 0;
data->rsrv[5] = 0;
data->unk1 = 0;
data->unk2 = 0;
data->unk3 = 0;
data->unk4 = 0;
data->unk5 = 0;
data->unk6 = 0;
data->unk7 = 0;
data->unk8 = 0;
/*data->rsrv[4] = 0;
data->rsrv[5] = 0;*/
data->DPadSenseA = 0;
data->DPadSenseB = 0;
data->GPadSenseA = 0;
data->GPadSenseB = 0;
data->AxisSenseA = 0;
data->AxisSenseB = 0;
data->TiltA = 0;
data->TiltB = 0;
}
else {
data->rsrv[0] = ctrlBuf->rsrv[0];
data->rsrv[1] = ctrlBuf->rsrv[1];
data->rsrv[4] = ctrlBuf->rsrv[4];
data->rsrv[5] = ctrlBuf->rsrv[5];
data->unk1 = ctrlBuf->unk1;
data->unk2 = ctrlBuf->unk2;
data->unk3 = ctrlBuf->unk3;
data->unk4 = ctrlBuf->unk4;
data->unk5 = ctrlBuf->unk5;
data->unk6 = ctrlBuf->unk6;
data->unk7 = ctrlBuf->unk7;
data->unk8 = ctrlBuf->unk8;
/*data->rsrv[4] = ctrlBuf->rsrv[4];
data->rsrv[5] = ctrlBuf->rsrv[5];*/
data->DPadSenseA = ctrlBuf->DPadSenseA;
data->DPadSenseB = ctrlBuf->DPadSenseB;
data->GPadSenseA = ctrlBuf->GPadSenseA;
data->GPadSenseB = ctrlBuf->GPadSenseB;
data->AxisSenseA = ctrlBuf->AxisSenseA;
data->AxisSenseB = ctrlBuf->AxisSenseB;
data->TiltA = ctrlBuf->TiltA;
data->TiltB = ctrlBuf->TiltB;
}
data += 1;
}