From ddf33463ece43efe17e7eb743f2b21db3e46292d Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 9 Aug 2012 07:29:56 +0200 Subject: [PATCH] (PSL1GHT) Add PSL1GHT ifdefs for input --- ps3/ps3_input.c | 27 +++++++++++++++++++++++++++ ps3/sdk_defines.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index 6a59b79d19..a2b0a1159c 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -150,6 +150,32 @@ static void ps3_input_poll(void *data) if (state_tmp.len != 0) { state[i] = 0; +#ifdef __PSL1GHT__ + state[i] |= (state_tmp.BTN_LEFT) ? PS3_GAMEPAD_DPAD_LEFT : 0; + state[i] |= (state_tmp.BTN_DOWN) ? PS3_GAMEPAD_DPAD_DOWN : 0; + state[i] |= (state_tmp.BTN_RIGHT) ? PS3_GAMEPAD_DPAD_RIGHT : 0; + state[i] |= (state_tmp.BTN_UP) ? PS3_GAMEPAD_DPAD_UP : 0; + state[i] |= (state_tmp.BTN_START) ? PS3_GAMEPAD_START : 0; + state[i] |= (state_tmp.BTN_R3) ? PS3_GAMEPAD_R3 : 0; + state[i] |= (state_tmp.BTN_L3) ? PS3_GAMEPAD_L3 : 0; + state[i] |= (state_tmp.BTN_SELECT) ? PS3_GAMEPAD_SELECT : 0; + state[i] |= (state_tmp.BTN_TRIANGLE) ? PS3_GAMEPAD_TRIANGLE : 0; + state[i] |= (state_tmp.BTN_SQUARE) ? PS3_GAMEPAD_SQUARE : 0; + state[i] |= (state_tmp.BTN_CROSS) ? PS3_GAMEPAD_CROSS : 0; + state[i] |= (state_tmp.BTN_CIRCLE) ? PS3_GAMEPAD_CIRCLE : 0; + state[i] |= (state_tmp.BTN_R1) ? PS3_GAMEPAD_R1 : 0; + state[i] |= (state_tmp.BTN_L1) ? PS3_GAMEPAD_L1 : 0; + state[i] |= (state_tmp.BTN_R2) ? PS3_GAMEPAD_R2 : 0; + state[i] |= (state_tmp.BTN_L2) ? PS3_GAMEPAD_L2 : 0; + state[i] |= (state_tmp.ANA_L_H <= DEADZONE_LOW) ? PS3_GAMEPAD_LSTICK_LEFT_MASK : 0; + state[i] |= (state_tmp.ANA_L_H >= DEADZONE_HIGH) ? PS3_GAMEPAD_LSTICK_RIGHT_MASK : 0; + state[i] |= (state_tmp.ANA_L_V <= DEADZONE_LOW) ? PS3_GAMEPAD_LSTICK_UP_MASK : 0; + state[i] |= (state_tmp.ANA_L_V >= DEADZONE_HIGH) ? PS3_GAMEPAD_LSTICK_DOWN_MASK : 0; + state[i] |= (state_tmp.ANA_R_H <= DEADZONE_LOW) ? PS3_GAMEPAD_RSTICK_LEFT_MASK : 0; + state[i] |= (state_tmp.ANA_R_H >= DEADZONE_HIGH) ? PS3_GAMEPAD_RSTICK_RIGHT_MASK : 0; + state[i] |= (state_tmp.ANA_R_V <= DEADZONE_LOW) ? PS3_GAMEPAD_RSTICK_UP_MASK : 0; + state[i] |= (state_tmp.ANA_R_V >= DEADZONE_HIGH) ? PS3_GAMEPAD_RSTICK_DOWN_MASK : 0; +#else state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_LEFT) ? PS3_GAMEPAD_DPAD_LEFT : 0; state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_DOWN) ? PS3_GAMEPAD_DPAD_DOWN : 0; state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_RIGHT) ? PS3_GAMEPAD_DPAD_RIGHT : 0; @@ -174,6 +200,7 @@ static void ps3_input_poll(void *data) state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X] >= DEADZONE_HIGH) ? PS3_GAMEPAD_RSTICK_RIGHT_MASK : 0; state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y] <= DEADZONE_LOW) ? PS3_GAMEPAD_RSTICK_UP_MASK : 0; state[i] |= (state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y] >= DEADZONE_HIGH) ? PS3_GAMEPAD_RSTICK_DOWN_MASK : 0; +#endif } } diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h index 72c5570d95..d258a327af 100644 --- a/ps3/sdk_defines.h +++ b/ps3/sdk_defines.h @@ -81,6 +81,8 @@ #define cellPadEnd ioPadEnd #define now_connect connected + +#define CELL_PAD_CTRL_LEFT BTN_LEFT #endif /*============================================================