From c30a2e058a37b60bbb1f6095d962d69b15875858 Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Wed, 24 Mar 2021 22:52:25 +0100 Subject: [PATCH] Implemented input auto-poll behaviour --- src/common/input/InputManager.h | 3 +- src/core/hle/XAPI/Xapi.cpp | 57 +++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/common/input/InputManager.h b/src/common/input/InputManager.h index bf4ea777e..40c8b7d78 100644 --- a/src/common/input/InputManager.h +++ b/src/common/input/InputManager.h @@ -99,7 +99,7 @@ typedef struct _CXBX_XINPUT_DEVICE_INFO { uint8_t ucSubType; // xbox controller subtype uint8_t ucInputStateSize; // xbox controller input state size in bytes, not include dwPacketNumber uint8_t ucFeedbackSize; // xbox controller feedback size in bytes, not include FeedbackHeader - uint16_t dwPacketNumber; + uint32_t dwPacketNumber; } CXBX_XINPUT_DEVICE_INFO, *PCXBX_XINPUT_DEVICE_INFO; @@ -117,6 +117,7 @@ typedef struct _CXBX_CONTROLLER_HOST_BRIDGE { bool bPendingRemoval; bool bSignaled; bool bIoInProgress; + bool bAutoPoll; // autopoll on/off, as instructed by the title in XInputOpen CXBX_XINPUT_DEVICE_INFO XboxDeviceInfo; } CXBX_CONTROLLER_HOST_BRIDGE, *PCXBX_CONTROLLER_HOST_BRIDGE; diff --git a/src/core/hle/XAPI/Xapi.cpp b/src/core/hle/XAPI/Xapi.cpp index 6bf460cfd..7bb0ddfbb 100644 --- a/src/core/hle/XAPI/Xapi.cpp +++ b/src/core/hle/XAPI/Xapi.cpp @@ -55,10 +55,10 @@ static CXBX_XINPUT_IN_STATE g_InState[4]; // Global bridge for xbox controller to host, 4 elements for 4 ports. CXBX_CONTROLLER_HOST_BRIDGE g_XboxControllerHostBridge[4] = { - { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[0], false, false, false, { 0, 0, 0, 0, 0 } }, - { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[1], false, false, false, { 0, 0, 0, 0, 0 } }, - { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[2], false, false, false, { 0, 0, 0, 0, 0 } }, - { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[3], false, false, false, { 0, 0, 0, 0, 0 } }, + { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[0], false, false, false, false, { 0, 0, 0, 0, 0 } }, + { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[1], false, false, false, false, { 0, 0, 0, 0, 0 } }, + { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[2], false, false, false, false, { 0, 0, 0, 0, 0 } }, + { NULL, PORT_INVALID, XBOX_INPUT_DEVICE::DEVICE_INVALID, &g_InState[3], false, false, false, false, { 0, 0, 0, 0, 0 } }, }; @@ -103,6 +103,7 @@ bool ConstructHleInputDevice(int Type, int Port) g_bIsDevicesEmulating = true; bool ret = true; + // NOTE: initialize bAutopoll to its default state, which varies depending on the device type switch (Type) { case to_underlying(XBOX_INPUT_DEVICE::MS_CONTROLLER_DUKE): { @@ -111,6 +112,7 @@ bool ConstructHleInputDevice(int Type, int Port) g_XboxControllerHostBridge[Port].bPendingRemoval = false; g_XboxControllerHostBridge[Port].bSignaled = false; g_XboxControllerHostBridge[Port].bIoInProgress = false; + g_XboxControllerHostBridge[Port].bAutoPoll = true; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucType = XINPUT_DEVTYPE_GAMEPAD; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucSubType = XINPUT_DEVSUBTYPE_GC_GAMEPAD; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize = sizeof(XpadInput); @@ -125,6 +127,7 @@ bool ConstructHleInputDevice(int Type, int Port) g_XboxControllerHostBridge[Port].bPendingRemoval = false; g_XboxControllerHostBridge[Port].bSignaled = false; g_XboxControllerHostBridge[Port].bIoInProgress = false; + g_XboxControllerHostBridge[Port].bAutoPoll = true; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucType = XINPUT_DEVTYPE_GAMEPAD; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucSubType = XINPUT_DEVSUBTYPE_GC_GAMEPAD_ALT; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize = sizeof(XpadInput); @@ -142,6 +145,7 @@ bool ConstructHleInputDevice(int Type, int Port) g_XboxControllerHostBridge[Port].bPendingRemoval = false; g_XboxControllerHostBridge[Port].bSignaled = false; g_XboxControllerHostBridge[Port].bIoInProgress = false; + g_XboxControllerHostBridge[Port].bAutoPoll = true; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucType = XINPUT_DEVTYPE_STEELBATTALION; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucSubType = XINPUT_DEVSUBTYPE_GC_GAMEPAD_ALT; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize = sizeof(SBCInput); @@ -156,6 +160,7 @@ bool ConstructHleInputDevice(int Type, int Port) g_XboxControllerHostBridge[Port].bPendingRemoval = false; g_XboxControllerHostBridge[Port].bSignaled = false; g_XboxControllerHostBridge[Port].bIoInProgress = false; + g_XboxControllerHostBridge[Port].bAutoPoll = true; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucType = XINPUT_DEVTYPE_GAMEPAD; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucSubType = XINPUT_DEVSUBTYPE_GC_ARCADE_STICK; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize = sizeof(XpadInput); @@ -191,6 +196,7 @@ void DestructHleInputDevice(int Port) g_XboxControllerHostBridge[Port].bPendingRemoval = false; g_XboxControllerHostBridge[Port].bSignaled = false; g_XboxControllerHostBridge[Port].bIoInProgress = false; + g_XboxControllerHostBridge[Port].bAutoPoll = false; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucType = 0; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucSubType = 0; g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize = 0; @@ -433,10 +439,12 @@ xbox::HANDLE WINAPI xbox::EMUPATCH(XInputOpen) if (dwPort >= PORT_1 && dwPort <= PORT_4) { if (DeviceType == g_XboxControllerHostBridge[dwPort].XboxType) { + if (pPollingParameters != xbox::zeroptr) { + g_XboxControllerHostBridge[dwPort].bAutoPoll = pPollingParameters->fAutoPoll; + } g_XboxControllerHostBridge[dwPort].hXboxDevice = &g_XboxControllerHostBridge[dwPort]; RETURN(g_XboxControllerHostBridge[dwPort].hXboxDevice); } - } RETURN(NULL); @@ -469,9 +477,22 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XInputPoll) { LOG_FUNC_ONE_ARG(hDevice); - // Nothing to do + // Test cases: Oddworld: Stranger's Wrath, Jet Set Radio Future, Splinter Cell 2, Panzer Dragoon Orta and 1 + dword_xt ret = ERROR_DEVICE_NOT_CONNECTED; + PCXBX_CONTROLLER_HOST_BRIDGE Device = (PCXBX_CONTROLLER_HOST_BRIDGE)hDevice; + int Port = Device->XboxPort; + if ((g_XboxControllerHostBridge[Port].hXboxDevice == hDevice) && !g_XboxControllerHostBridge[Port].bPendingRemoval) { + if (!g_XboxControllerHostBridge[Port].bAutoPoll) { + g_XboxControllerHostBridge[Port].bIoInProgress = true; + if (g_InputDeviceManager.UpdateXboxPortInput(Port, g_XboxControllerHostBridge[Port].InState, DIRECTION_IN, to_underlying(g_XboxControllerHostBridge[Port].XboxType))) { + g_XboxControllerHostBridge[Port].XboxDeviceInfo.dwPacketNumber++; + } + g_XboxControllerHostBridge[Port].bIoInProgress = false; + } + ret = ERROR_SUCCESS; + } - RETURN(ERROR_SUCCESS); + RETURN(ret); } // ****************************************************************** @@ -520,16 +541,18 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(XInputGetState) dword_xt ret = ERROR_DEVICE_NOT_CONNECTED; PCXBX_CONTROLLER_HOST_BRIDGE Device = (PCXBX_CONTROLLER_HOST_BRIDGE)hDevice; int Port = Device->XboxPort; - if (g_XboxControllerHostBridge[Port].hXboxDevice == hDevice) { - if (!g_XboxControllerHostBridge[Port].bPendingRemoval) { - g_XboxControllerHostBridge[Port].bIoInProgress = true; - if (g_InputDeviceManager.UpdateXboxPortInput(Port, g_XboxControllerHostBridge[Port].InState, DIRECTION_IN, to_underlying(g_XboxControllerHostBridge[Port].XboxType))) { - pState->dwPacketNumber = g_XboxControllerHostBridge[Port].XboxDeviceInfo.dwPacketNumber++; - } - memcpy((void*)&pState->Gamepad, g_XboxControllerHostBridge[Port].InState, g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize); - g_XboxControllerHostBridge[Port].bIoInProgress = false; - ret = ERROR_SUCCESS; - } + if ((g_XboxControllerHostBridge[Port].hXboxDevice == hDevice) && (!g_XboxControllerHostBridge[Port].bPendingRemoval)) { + if (g_XboxControllerHostBridge[Port].bAutoPoll) { + g_XboxControllerHostBridge[Port].bIoInProgress = true; + if (g_InputDeviceManager.UpdateXboxPortInput(Port, g_XboxControllerHostBridge[Port].InState, DIRECTION_IN, to_underlying(g_XboxControllerHostBridge[Port].XboxType))) { + g_XboxControllerHostBridge[Port].XboxDeviceInfo.dwPacketNumber++; + } + g_XboxControllerHostBridge[Port].bIoInProgress = false; + } + + std::memcpy((void *)&pState->Gamepad, g_XboxControllerHostBridge[Port].InState, g_XboxControllerHostBridge[Port].XboxDeviceInfo.ucInputStateSize); + pState->dwPacketNumber = g_XboxControllerHostBridge[Port].XboxDeviceInfo.dwPacketNumber; + ret = ERROR_SUCCESS; } RETURN(ret);