mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 03:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Ping pong commit to get everything working again

Browse Source
This commit is contained in:
TwinAphex51224 2012-03-05 23:32:51 +01:00
parent 25a97b1d8c
commit 9d17ccf4f3
2 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
input/input_luts.c
View File

@ -19,24 +19,8 @@
#include <stddef.h> #include <stddef.h>
#include "input_luts.h" #include "input_luts.h"
/*
uint64_t default_keybind_lut[SSNES_FIRST_META_KEY]; uint64_t default_keybind_lut[SSNES_FIRST_META_KEY];
const char *default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY] = {
"B Button", // SNES_DEVICE_ID_JOYPAD_B
"Y Button", // SNES_DEVICE_ID_JOYPAD_Y
"Select button", // SNES_DEVICE_ID_JOYPAD_SELECT
"Start button", // SNES_DEVICE_ID_JOYPAD_START
"D-Pad Up", // SNES_DEVICE_ID_JOYPAD_UP
"D-Pad Down", // SNES_DEVICE_ID_JOYPAD_DOWN
"D-Pad Left", // SNES_DEVICE_ID_JOYPAD_LEFT
"D-Pad Right", // SNES_DEVICE_ID_JOYPAD_RIGHT
"A Button", // SNES_DEVICE_ID_JOYPAD_A
"X Button", // SNES_DEVICE_ID_JOYPAD_X
"L Button", // SNES_DEVICE_ID_JOYPAD_L
"R Button", // SNES_DEVICE_ID_JOYPAD_R
};
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY] = { uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY] = {
CTRL_CIRCLE_MASK, CTRL_CIRCLE_MASK,
@ -72,42 +56,7 @@ uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY] = {
CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, CTRL_UP_MASK | CTRL_RSTICK_UP_MASK,
CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK,
}; };
#endif
char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY][256] = {
"Circle button",
"Cross button",
"Triangle button",
"Square button",
"D-Pad Up",
"D-Pad Down",
"D-Pad Left",
"D-Pad Right",
"Select button",
"Start button",
"L1 button",
"L2 button",
"L3 button",
"R1 button",
"R2 button",
"R3 button",
"LStick Left",
"LStick Right",
"LStick Up",
"LStick Down",
"LStick D-Pad Left",
"LStick D-Pad Right",
"LStick D-Pad Up",
"LStick D-Pad Down",
"RStick Left",
"RStick Right",
"RStick Up",
"RStick Down",
"RStick D-Pad Left",
"RStick D-Pad Right",
"RStick D-Pad Up",
"RStick D-Pad Down",
};
*/
struct platform_bind struct platform_bind
{ {
@ -192,8 +141,8 @@ const char *ssnes_input_find_platform_key_label(uint64_t joykey)
size_t arr_size = sizeof(platform_keys) / sizeof(platform_keys[0]); size_t arr_size = sizeof(platform_keys) / sizeof(platform_keys[0]);
for (size_t i = 0; i < arr_size; i++) for (size_t i = 0; i < arr_size; i++)
{ {
if (bind_label[i].joykey == joykey) if (platform_keys[i].joykey == joykey)
return bind_label[i].label; return platform_keys[i].label;
} }
return "Unknown"; return "Unknown";

6
input/input_luts.h
View File

@ -67,12 +67,8 @@ enum ps3_device_id
#elif defined(_XBOX) #elif defined(_XBOX)
#endif #endif
#if 0
extern uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY];
extern char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY][256];
extern uint64_t default_keybind_lut[SSNES_FIRST_META_KEY]; extern uint64_t default_keybind_lut[SSNES_FIRST_META_KEY];
extern const char *default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY]; extern uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY];
#endif
const char *ssnes_input_find_platform_key_label(uint64_t joykey); const char *ssnes_input_find_platform_key_label(uint64_t joykey);
uint64_t ssnes_input_find_previous_platform_key(uint64_t joykey); uint64_t ssnes_input_find_previous_platform_key(uint64_t joykey);