ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XDK) Refactor xdk_joypad.c

This commit is contained in:
twinaphex 2018-01-19 21:24:28 +01:00
parent 58e87387d5
commit 82f721145c
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
input/drivers_joypad/xdk_joypad.c
View File

@ -23,9 +23,6 @@ static uint64_t pad_state[MAX_PADS];
static int16_t analog_state[MAX_PADS][2][2];
#ifdef _XBOX1
static HANDLE gamepads[MAX_PADS];
static DWORD dwDeviceMask;
static bool bInserted[MAX_PADS];
static bool bRemoved[MAX_PADS];
#endif
static const char* const XBOX_CONTROLLER_NAMES[4] =
@ -131,12 +128,11 @@ static int16_t xdk_joypad_axis(unsigned port_num, uint32_t joyaxis)
return val;
}
static void xdk_joypad_poll(void)
{
unsigned port;
#if defined(_XBOX1)
unsigned int dwInsertions, dwRemovals;
DWORD dwInsertions, dwRemovals;
#ifdef __cplusplus
XGetDeviceChanges(XDEVICE_TYPE_GAMEPAD,
@ -154,19 +150,25 @@ static void xdk_joypad_poll(void)
unsigned i, j;
XINPUT_STATE state_tmp;
uint64_t *state_cur = NULL;
#ifdef _XBOX1
#if defined(_XBOX1)
XINPUT_CAPABILITIES caps[MAX_PADS];
(void)caps;
bool device_removed = false;
bool device_inserted = false;
/* handle inserted devices. */
/* handle removed devices. */
bRemoved[port] = (dwRemovals & (1 << port)) ? true : false;
if (dwRemovals & (1 << port))
device_removed = true;
if (dwInsertions & (1 << port))
device_inserted = true;
if(bRemoved[port])
if (device_removed)
{
/* if the controller was removed after
* XGetDeviceChanges but before
* XInputOpen, the device handle will be NULL. */
if(gamepads[port])
if (gamepads[port])
XInputClose(gamepads[port]);
gamepads[port] = 0;
@ -175,17 +177,17 @@ static void xdk_joypad_poll(void)
input_autoconfigure_disconnect(port, xdk_joypad.ident);
}
/* handle inserted devices. */
bInserted[port] = (dwInsertions & (1 << port)) ? true : false;
if(bInserted[port])
if (device_inserted)
{
XINPUT_POLLING_PARAMETERS m_pollingParameters;
m_pollingParameters.fAutoPoll = FALSE;
m_pollingParameters.fInterruptOut = TRUE;
m_pollingParameters.bInputInterval = 8;
m_pollingParameters.fAutoPoll = FALSE;
m_pollingParameters.fInterruptOut = TRUE;
m_pollingParameters.bInputInterval = 8;
m_pollingParameters.bOutputInterval = 8;
gamepads[port] = XInputOpen(XDEVICE_TYPE_GAMEPAD, port,
gamepads[port] = XInputOpen(
XDEVICE_TYPE_GAMEPAD, port,
XDEVICE_NO_SLOT, &m_pollingParameters);
xdk_joypad_autodetect_add(port);
@ -197,9 +199,6 @@ static void xdk_joypad_poll(void)
/* if the controller is removed after
* XGetDeviceChanges but before XInputOpen,
* the device handle will be NULL. */
#endif
#if defined(_XBOX1)
if (XInputPoll(gamepads[port]) != ERROR_SUCCESS)
continue;
@ -261,6 +260,21 @@ static bool xdk_joypad_query_pad(unsigned pad)
static void xdk_joypad_destroy(void)
{
unsigned i;
for (i = 0; i < MAX_PADS; i++)
{
pad_state[i] = 0;
analog_state[i][0][0] = 0;
analog_state[i][0][1] = 0;
analog_state[i][1][0] = 0;
analog_state[i][1][1] = 0;
#if defined(_XBOX1)
if (gamepads[i])
XInputClose(gamepads[i]);
gamepads[i] = 0;
#endif
}
}
input_device_driver_t xdk_joypad = {