mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-19 16:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(ps2_joypad) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-09-11 12:32:06 +02:00
parent b122f314d4
commit 0c45135160
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/drivers_joypad/ps2_joypad.c
View File

@ -39,16 +39,6 @@ static INLINE int16_t convert_u8_to_s16(uint8_t val)
return val * 0x0101 - 0x8000; return val * 0x0101 - 0x8000;
} }
static bool is_analog_enabled(struct padButtonStatus buttons)
{
bool enabled = false;
if (buttons.ljoy_h || buttons.ljoy_v || buttons.rjoy_h || buttons.rjoy_v)
enabled = true;
return enabled;
}
static const char *ps2_joypad_name(unsigned pad) static const char *ps2_joypad_name(unsigned pad)
{ {
return "PS2 Controller"; return "PS2 Controller";
@ -60,9 +50,6 @@ static bool ps2_joypad_init(void *data)
unsigned port = 0; unsigned port = 0;
bool init = true; bool init = true;
printf("PortMax: %d\n", padGetPortMax());
printf("SlotMax: %d\n", padGetSlotMax(port));
for (port = 0; port < DEFAULT_MAX_PADS; port++) for (port = 0; port < DEFAULT_MAX_PADS; port++)
{ {
input_autoconfigure_connect( ps2_joypad_name(port), input_autoconfigure_connect( ps2_joypad_name(port),
@ -75,7 +62,6 @@ static bool ps2_joypad_init(void *data)
/* Port 0 -> Connector 1, Port 1 -> Connector 2 */ /* Port 0 -> Connector 1, Port 1 -> Connector 2 */
if((ret = padPortOpen(port, PS2_PAD_SLOT, padBuf[port])) == 0) if((ret = padPortOpen(port, PS2_PAD_SLOT, padBuf[port])) == 0)
{ {
printf("padOpenPort failed: %d\n", ret);
init = false; init = false;
break; break;
} }
@ -209,7 +195,7 @@ static void ps2_joypad_poll(void)
pad_state[player] |= (state_tmp & PAD_L3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0; pad_state[player] |= (state_tmp & PAD_L3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0;
/* Analog */ /* Analog */
if (is_analog_enabled(buttons)) if (buttons.ljoy_h || buttons.ljoy_v || buttons.rjoy_h || buttons.rjoy_v)
{ {
analog_state[player][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(buttons.ljoy_h); analog_state[player][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(buttons.ljoy_h);
analog_state[player][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(buttons.ljoy_v);; analog_state[player][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(buttons.ljoy_v);;