diff --git a/input/drivers/psl1ght_input.c b/input/drivers/psl1ght_input.c index 917a72311d..6581518fe3 100644 --- a/input/drivers/psl1ght_input.c +++ b/input/drivers/psl1ght_input.c @@ -450,41 +450,41 @@ static int16_t ps3_joypad_axis(unsigned port_num, uint32_t joyaxis) bool is_neg = false; bool is_pos = false; - if (joyaxis == AXIS_NONE || port_num >= DEFAULT_MAX_PADS) + if (port_num >= DEFAULT_MAX_PADS) return 0; if (AXIS_NEG_GET(joyaxis) < 4) { - axis = AXIS_NEG_GET(joyaxis); - is_neg = true; + axis = AXIS_NEG_GET(joyaxis); + is_neg = true; } else if (AXIS_POS_GET(joyaxis) < 4) { - axis = AXIS_POS_GET(joyaxis); - is_pos = true; + axis = AXIS_POS_GET(joyaxis); + is_pos = true; } switch (axis) { case 0: - val = pad_state[port_num].ANA_L_H; + val = pad_state[port_num].ANA_L_H; break; case 1: - val = pad_state[port_num].ANA_L_V; + val = pad_state[port_num].ANA_L_V; break; case 2: - val = pad_state[port_num].ANA_R_H; + val = pad_state[port_num].ANA_R_H; break; case 3: - val = pad_state[port_num].ANA_R_V; + val = pad_state[port_num].ANA_R_V; break; } - val = (val - 0x7f) * 0xff; + val = (val - 0x7f) * 0xff; if (is_neg && val > 0) - val = 0; + val = 0; else if (is_pos && val < 0) - val = 0; + val = 0; return val; } diff --git a/input/drivers_joypad/wiiu/kpad_driver.c b/input/drivers_joypad/wiiu/kpad_driver.c index f2c7b00b83..f616fa9fa0 100644 --- a/input/drivers_joypad/wiiu/kpad_driver.c +++ b/input/drivers_joypad/wiiu/kpad_driver.c @@ -128,7 +128,7 @@ static int16_t kpad_axis(unsigned pad, uint32_t axis) axis_data data; 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; pad_functions.read_axis_data(axis, &data);