mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Some cleanups for keybinding

Browse Source
This commit is contained in:
TwinAphex51224 2012-02-02 16:12:38 +01:00
parent 40ce42c87c
commit 3eaa942e58
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ps3/main.c
View File

@ -129,15 +129,19 @@ static void set_default_settings(void)
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_UP].id = SNES_DEVICE_ID_JOYPAD_UP; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_UP].id = SNES_DEVICE_ID_JOYPAD_UP;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_UP].joykey = CTRL_UP_MASK; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_UP].joykey = CTRL_UP_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_UP].joyaxis = CTRL_LSTICK_UP_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_DOWN].id = SNES_DEVICE_ID_JOYPAD_DOWN; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_DOWN].id = SNES_DEVICE_ID_JOYPAD_DOWN;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_DOWN].joykey = CTRL_DOWN_MASK; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_DOWN].joykey = CTRL_DOWN_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_DOWN].joyaxis = CTRL_LSTICK_DOWN_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_LEFT].id = SNES_DEVICE_ID_JOYPAD_LEFT; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_LEFT].id = SNES_DEVICE_ID_JOYPAD_LEFT;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_LEFT].joykey = CTRL_LEFT_MASK; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_LEFT].joykey = CTRL_LEFT_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_LEFT].joyaxis = CTRL_LSTICK_LEFT_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_RIGHT].id = SNES_DEVICE_ID_JOYPAD_RIGHT; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_RIGHT].id = SNES_DEVICE_ID_JOYPAD_RIGHT;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_RIGHT].joykey = CTRL_RIGHT_MASK; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_RIGHT].joykey = CTRL_RIGHT_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_RIGHT].joyaxis = CTRL_LSTICK_RIGHT_MASK;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_A].id = SNES_DEVICE_ID_JOYPAD_A; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_A].id = SNES_DEVICE_ID_JOYPAD_A;
g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_A].joykey = CTRL_CIRCLE_MASK; g_settings.input.binds[x][SNES_DEVICE_ID_JOYPAD_A].joykey = CTRL_CIRCLE_MASK;

46
ps3/ps3_input.c
View File

@ -37,7 +37,6 @@ static int16_t ps3_input_state(void *data, const struct snes_keybind **binds,
unsigned index, unsigned id) unsigned index, unsigned id)
{ {
(void)data; (void)data;
(void)index;
unsigned pads_connected, player; unsigned pads_connected, player;
uint64_t button; uint64_t button;
@ -59,52 +58,7 @@ static int16_t ps3_input_state(void *data, const struct snes_keybind **binds,
player += index; player += index;
} }
// Hardcoded binds.
button = binds[player][id].joykey; button = binds[player][id].joykey;
#if 0
switch (id)
{
case SNES_DEVICE_ID_JOYPAD_A:
button = CTRL_CIRCLE_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_B:
button = CTRL_CROSS_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_X:
button = CTRL_TRIANGLE_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_Y:
button = CTRL_SQUARE_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_LEFT:
button = CTRL_LEFT_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_RIGHT:
button = CTRL_RIGHT_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_UP:
button = CTRL_UP_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_DOWN:
button = CTRL_DOWN_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_START:
button = CTRL_START_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_SELECT:
button = CTRL_SELECT_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_L:
button = CTRL_L1_MASK;
break;
case SNES_DEVICE_ID_JOYPAD_R:
button = CTRL_R1_MASK;
break;
default:
button = 0;
break;
}
#endif
return CTRL_MASK(state[player], button) ? 1 : 0; return CTRL_MASK(state[player], button) ? 1 : 0;
} }