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

(MFi) Buildfix

This commit is contained in:
twinaphex 2015-11-16 11:12:00 +01:00
parent 0e0db66f79
commit f967b07f19
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
input/drivers_joypad/mfi_joypad.m
View File

@ -31,7 +31,7 @@
static uint32_t mfi_buttons[MAX_USERS]; static uint32_t mfi_buttons[MAX_USERS];
static int16_t mfi_axes[MAX_USERS][6]; static int16_t mfi_axes[MAX_USERS][6];
static GCController* mfi_controllers[MAX_MFI_CONTROLLERS]; static uint32_t mfi_controllers[MAX_MFI_CONTROLLERS];
enum enum
{ {
@ -139,26 +139,21 @@ static void apple_gamecontroller_joypad_register(GCGamepad *gamepad)
static void apple_gamecontroller_joypad_connect(GCController *controller) static void apple_gamecontroller_joypad_connect(GCController *controller)
{ {
signed desired_index = (int32_t)controller.playerIndex; signed desired_index = (int32_t)controller.playerIndex;
desired_index = (desired_index >= 0 && desired_index < MAX_MFI_CONTROLLERS) desired_index = (desired_index >= 0 && desired_index < MAX_MFI_CONTROLLERS) ? desired_index : 0;
? desired_index : GCCONTROLLER_PLAYER_INDEX_UNSET;
/* prevent same controller getting set twice */ if (mfi_controllers[desired_index] != controller.hash) { // prevent same controller getting set twice
if (mfi_controllers[desired_index] != controller)
{ // desired slot is unused, take it
/* desired slot is unused, take it */ if (!mfi_controllers[desired_index]) {
if (!mfi_controllers[desired_index])
{
controller.playerIndex = desired_index; controller.playerIndex = desired_index;
mfi_controllers[desired_index] = controller; mfi_controllers[desired_index] = controller.hash;
} }
/* find a new slot for this controller that's unused */
else if (desired_index == GCCONTROLLER_PLAYER_INDEX_UNSET || mfi_controllers[desired_index]) // find a new slot for this controller that's unused
{ else {
unsigned i; for (int i = 0; i < MAX_MFI_CONTROLLERS; ++i)
for (i = 0; i < MAX_MFI_CONTROLLERS; ++i) if (!mfi_controllers[i]) {
if (!mfi_controllers[i]) mfi_controllers[i] = controller.hash;
{
mfi_controllers[i] = controller;
controller.playerIndex = i; controller.playerIndex = i;
break; break;
} }
@ -174,8 +169,8 @@ static void apple_gamecontroller_joypad_disconnect(GCController* controller)
if (pad == GCCONTROLLER_PLAYER_INDEX_UNSET) if (pad == GCCONTROLLER_PLAYER_INDEX_UNSET)
return; return;
else
mfi_controllers[pad] = NULL; mfi_controllers[pad] = 0;
} }
bool apple_gamecontroller_joypad_init(void *data) bool apple_gamecontroller_joypad_init(void *data)
@ -183,7 +178,6 @@ bool apple_gamecontroller_joypad_init(void *data)
static bool inited = false; static bool inited = false;
if (inited) if (inited)
return true; return true;
if (!apple_gamecontroller_available()) if (!apple_gamecontroller_available())
return false; return false;