mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-27 23:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(xbox 1) Changes to Xinput1 driver - still not working - WIP

Browse Source
This commit is contained in:
twinaphex 2012-07-13 23:34:46 +02:00
parent 6ccc887542
commit a82c1cb6e5
1 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
xbox1/xinput_xbox_input.c
View File

@ -28,21 +28,53 @@
static uint64_t state[4]; static uint64_t state[4];
HANDLE gamepads[4]; HANDLE gamepads[4];
DWORD dwDeviceMask;
bool bInserted[4];
bool bRemoved[4];
XINPUT_CAPABILITIES caps[4];
static unsigned pads_connected; static unsigned pads_connected;
static void xinput_input_poll(void *data) static void xinput_input_poll(void *data)
{ {
(void)data; (void)data;
unsigned int dwInsertions, dwRemovals;
XGetDeviceChanges(XDEVICE_TYPE_GAMEPAD, reinterpret_cast<PDWORD>(&dwInsertions), reinterpret_cast<PDWORD>(&dwRemovals));
pads_connected = 0; pads_connected = 0;
for (unsigned i = 0; i < 4; i++) for (unsigned i = 0; i < 4; i++)
{ {
// handle removed devices
bRemoved[i] = (dwRemovals & (1<<i)) ? true : false;
if(bRemoved[i])
{
// if the controller was removed after XGetDeviceChanges but before
// XInputOpen, the device handle will be NULL
if(gamepads[i])
XInputClose(gamepads[i]);
gamepads[i] = NULL;
}
// handle inserted devices
bInserted[i] = (dwInsertions & (1<<i)) ? true : false;
XINPUT_STATE state_tmp; XINPUT_STATE state_tmp;
unsigned long retval; unsigned long retval;
XINPUT_POLLING_PARAMETERS m_pollingParameters;
// if the controller is removed after XGetDeviceChanges but before
// XInputOpen, the device handle will be NULL
m_pollingParameters.fAutoPoll = TRUE;
m_pollingParameters.fInterruptOut = TRUE;
m_pollingParameters.bInputInterval = 8;
m_pollingParameters.bOutputInterval = 8;
gamepads[i] = XInputOpen(XDEVICE_TYPE_GAMEPAD, i, XDEVICE_NO_SLOT, NULL); gamepads[i] = XInputOpen(XDEVICE_TYPE_GAMEPAD, i, XDEVICE_NO_SLOT, NULL);
if(gamepads[i] != NULL)
if(gamepads[i])
{ {
retval = XInputGetState(gamepads[i], &state_tmp); retval = XInputGetState(gamepads[i], &state_tmp);
pads_connected += (retval != ERROR_SUCCESS) ? 0 : 1; pads_connected += (retval != ERROR_SUCCESS) ? 0 : 1;
@ -79,14 +111,33 @@ static void xinput_input_free_input(void *data)
static void* xinput_input_init(void) static void* xinput_input_init(void)
{ {
XDEVICE_PREALLOC_TYPE types[] = //XDEVICE_PREALLOC_TYPE types[] =
{ //{
{XDEVICE_TYPE_GAMEPAD, 4}, // {XDEVICE_TYPE_GAMEPAD, 4},
{XDEVICE_TYPE_MEMORY_UNIT, 2} // {XDEVICE_TYPE_MEMORY_UNIT, 2}
}; //};
XInitDevices(sizeof(types) / sizeof(XDEVICE_PREALLOC_TYPE), //XInitDevices(sizeof(types) / sizeof(XDEVICE_PREALLOC_TYPE),
types ); //types );
XInitDevices(0, NULL);
dwDeviceMask = XGetDevices(XDEVICE_TYPE_GAMEPAD);
//Check the device status
switch(XGetDeviceEnumerationStatus())
{
case XDEVICE_ENUMERATION_IDLE:
RARCH_LOG("XDEVICE_ENUMERATION_IDLE\n");
break;
case XDEVICE_ENUMERATION_BUSY:
RARCH_LOG("XDEVICE_ENUMERATION_BUSY\n");
break;
}
while(XGetDeviceEnumerationStatus() == XDEVICE_ENUMERATION_BUSY)
{
}
return (void*)-1; return (void*)-1;
} }