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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-07-18 23:06:12 +02:00
parent 38a410105e
commit ad2279bb29
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
input/drivers/psl1ght_input.c
View File

@ -450,41 +450,41 @@ static int16_t ps3_joypad_axis(unsigned port_num, uint32_t joyaxis)
bool is_neg = false; bool is_neg = false;
bool is_pos = false; bool is_pos = false;
if (joyaxis == AXIS_NONE || port_num >= DEFAULT_MAX_PADS) if (port_num >= DEFAULT_MAX_PADS)
return 0; return 0;
if (AXIS_NEG_GET(joyaxis) < 4) if (AXIS_NEG_GET(joyaxis) < 4)
{ {
axis = AXIS_NEG_GET(joyaxis); axis = AXIS_NEG_GET(joyaxis);
is_neg = true; is_neg = true;
} }
else if (AXIS_POS_GET(joyaxis) < 4) else if (AXIS_POS_GET(joyaxis) < 4)
{ {
axis = AXIS_POS_GET(joyaxis); axis = AXIS_POS_GET(joyaxis);
is_pos = true; is_pos = true;
} }
switch (axis) switch (axis)
{ {
case 0: case 0:
val = pad_state[port_num].ANA_L_H; val = pad_state[port_num].ANA_L_H;
break; break;
case 1: case 1:
val = pad_state[port_num].ANA_L_V; val = pad_state[port_num].ANA_L_V;
break; break;
case 2: case 2:
val = pad_state[port_num].ANA_R_H; val = pad_state[port_num].ANA_R_H;
break; break;
case 3: case 3:
val = pad_state[port_num].ANA_R_V; val = pad_state[port_num].ANA_R_V;
break; break;
} }
val = (val - 0x7f) * 0xff; val = (val - 0x7f) * 0xff;
if (is_neg && val > 0) if (is_neg && val > 0)
val = 0; val = 0;
else if (is_pos && val < 0) else if (is_pos && val < 0)
val = 0; val = 0;
return val; return val;
} }

2
input/drivers_joypad/wiiu/kpad_driver.c
View File

@ -128,7 +128,7 @@ static int16_t kpad_axis(unsigned pad, uint32_t axis)
axis_data data; axis_data data;
int channel = to_wiimote_channel(pad); int channel = to_wiimote_channel(pad);
if (!kpad_query_pad(pad) || channel < 0 || axis == AXIS_NONE) if (!kpad_query_pad(pad) || channel < 0)
return 0; return 0;
pad_functions.read_axis_data(axis, &data); pad_functions.read_axis_data(axis, &data);