From d9ff2d7c8ff53b24ce7b191b26285e56adc146a9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 14 Jul 2012 03:19:28 +0200 Subject: [PATCH] (Xbox 1) Compile in keybinds --- console/retroarch_console.c | 2 +- xbox1/xinput_xbox_input.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/console/retroarch_console.c b/console/retroarch_console.c index 48e3e76469..6733c67b03 100644 --- a/console/retroarch_console.c +++ b/console/retroarch_console.c @@ -475,7 +475,7 @@ void rarch_input_set_controls_default (void) rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[PS3_DEVICE_ID_JOYPAD_R3].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey; -#elif defined(_XBOX360) +#elif defined(_XBOX) rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[XDK_DEVICE_ID_JOYPAD_A].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[XDK_DEVICE_ID_JOYPAD_X].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[XDK_DEVICE_ID_JOYPAD_BACK].joykey; diff --git a/xbox1/xinput_xbox_input.c b/xbox1/xinput_xbox_input.c index de0d2c9622..e2fd737026 100644 --- a/xbox1/xinput_xbox_input.c +++ b/xbox1/xinput_xbox_input.c @@ -111,15 +111,6 @@ static void xinput_input_free_input(void *data) static void* xinput_input_init(void) { - //XDEVICE_PREALLOC_TYPE types[] = - //{ - // {XDEVICE_TYPE_GAMEPAD, 4}, - // {XDEVICE_TYPE_MEMORY_UNIT, 2} - //}; - - //XInitDevices(sizeof(types) / sizeof(XDEVICE_PREALLOC_TYPE), - //types ); - XInitDevices(0, NULL); dwDeviceMask = XGetDevices(XDEVICE_TYPE_GAMEPAD);