diff --git a/psp/psp_input.c b/psp/psp_input.c index e44537cb34..3c95aeec09 100644 --- a/psp/psp_input.c +++ b/psp/psp_input.c @@ -75,60 +75,113 @@ const struct platform_bind platform_keys[] = { #endif }; -static uint64_t state; +extern const rarch_joypad_driver_t psp_joypad; + +typedef struct psp_input +{ + uint64_t pad_state[1]; + int16_t analog_state[1][2][2]; +} psp_input_t; static void psp_input_poll(void *data) { - (void)data; - SceCtrlData state_tmp; + psp_input_t *psp = (psp_input_t*)data; int ret = CtrlReadBufferPositive(0, &state_tmp, 1); - state = 0; + + psp->pad_state[0] = 0; if (ret != SCE_OK) return; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_LEFT) ? PSP_GAMEPAD_DPAD_LEFT : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_DOWN) ? PSP_GAMEPAD_DPAD_DOWN : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_RIGHT) ? PSP_GAMEPAD_DPAD_RIGHT : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_UP) ? PSP_GAMEPAD_DPAD_UP : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_START) ? PSP_GAMEPAD_START : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_SELECT) ? PSP_GAMEPAD_SELECT : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_TRIANGLE) ? PSP_GAMEPAD_TRIANGLE : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_SQUARE) ? PSP_GAMEPAD_SQUARE : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_CROSS) ? PSP_GAMEPAD_CROSS : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_CIRCLE) ? PSP_GAMEPAD_CIRCLE : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_R) ? PSP_GAMEPAD_R : 0; - state |= (STATE_BUTTON(state_tmp) & PSP_CTRL_L) ? PSP_GAMEPAD_L : 0; - state |= (STATE_ANALOGLX(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_LSTICK_LEFT_MASK : 0; - state |= (STATE_ANALOGLX(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_LSTICK_RIGHT_MASK : 0; - state |= (STATE_ANALOGLY(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_LSTICK_UP_MASK : 0; - state |= (STATE_ANALOGLY(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_LSTICK_DOWN_MASK : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_LEFT) ? PSP_GAMEPAD_DPAD_LEFT : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_DOWN) ? PSP_GAMEPAD_DPAD_DOWN : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_RIGHT) ? PSP_GAMEPAD_DPAD_RIGHT : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_UP) ? PSP_GAMEPAD_DPAD_UP : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_START) ? PSP_GAMEPAD_START : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_SELECT) ? PSP_GAMEPAD_SELECT : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_TRIANGLE) ? PSP_GAMEPAD_TRIANGLE : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_SQUARE) ? PSP_GAMEPAD_SQUARE : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_CROSS) ? PSP_GAMEPAD_CROSS : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_CIRCLE) ? PSP_GAMEPAD_CIRCLE : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_R) ? PSP_GAMEPAD_R : 0; + psp->pad_state[0] |= (STATE_BUTTON(state_tmp) & PSP_CTRL_L) ? PSP_GAMEPAD_L : 0; + psp->pad_state[0] |= (STATE_ANALOGLX(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_LSTICK_LEFT_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGLX(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_LSTICK_RIGHT_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGLY(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_LSTICK_UP_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGLY(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_LSTICK_DOWN_MASK : 0; #ifdef SN_TARGET_PSP2 - state |= (STATE_ANALOGRX(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_RSTICK_LEFT_MASK : 0; - state |= (STATE_ANALOGRX(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_RSTICK_RIGHT_MASK : 0; - state |= (STATE_ANALOGRY(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_RSTICK_UP_MASK : 0; - state |= (STATE_ANALOGRY(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_RSTICK_DOWN_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGRX(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_RSTICK_LEFT_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGRX(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_RSTICK_RIGHT_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGRY(state_tmp) < ANALOGSTICK_DEADZONE_LOW) ? PSP_GAMEPAD_RSTICK_UP_MASK : 0; + psp->pad_state[0] |= (STATE_ANALOGRY(state_tmp) > ANALOGSTICK_DEADZONE_HIGH) ? PSP_GAMEPAD_RSTICK_DOWN_MASK : 0; #endif } +static bool psp_menu_input_state(uint64_t joykey, uint64_t state) +{ + switch (joykey) + { + case CONSOLE_MENU_A: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_A); + case CONSOLE_MENU_B: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + case CONSOLE_MENU_X: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_X); + case CONSOLE_MENU_Y: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); + case CONSOLE_MENU_START: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_START); + case CONSOLE_MENU_SELECT: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); + case CONSOLE_MENU_UP: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_UP); + case CONSOLE_MENU_DOWN: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN); + case CONSOLE_MENU_LEFT: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT); + case CONSOLE_MENU_RIGHT: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT); + case CONSOLE_MENU_L: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L); + case CONSOLE_MENU_R: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R); + case CONSOLE_MENU_HOME: + return (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)); + case CONSOLE_MENU_L2: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L2); + case CONSOLE_MENU_R2: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2); + case CONSOLE_MENU_L3: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3); + case CONSOLE_MENU_R3: + return state & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3); + default: + return false; + } +} + static int16_t psp_input_state(void *data, const struct retro_keybind **binds, unsigned port, unsigned device, unsigned index, unsigned id) { - (void)data; + psp_input_t *psp = (psp_input_t*)data; - uint64_t button = binds[0][id].joykey; - int16_t retval = 0; + if (port > 0) + return 0; switch (device) { case RETRO_DEVICE_JOYPAD: - retval = (state & button) ? 1 : 0; - break; + if (binds[port][id].joykey >= CONSOLE_MENU_FIRST && binds[port][id].joykey <= CONSOLE_MENU_LAST) + return psp_menu_input_state(binds[port][id].joykey, psp->pad_state[port]) ? 1 : 0; + else + return input_joypad_pressed(&psp_joypad, port, binds[port], id); + case RETRO_DEVICE_ANALOG: + return input_joypad_analog(&psp_joypad, port, index, id, binds[port]); } - return retval; + return 0; } static void psp_input_free_input(void *data) @@ -140,16 +193,58 @@ static void psp_input_set_keybinds(void *data, unsigned device, unsigned port, unsigned id, unsigned keybind_action) { (void)device; - (void)id; + uint64_t *key = &g_settings.input.binds[port][id].joykey; + + if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BIND)) + *key = g_settings.input.binds[port][id].def_joykey; if (keybind_action & (1ULL << KEYBINDS_ACTION_SET_DEFAULT_BINDS)) { - for (unsigned i = 0; i < RARCH_CUSTOM_BIND_LIST_END; i++) - { - g_settings.input.binds[port][i].id = i; - g_settings.input.binds[port][i].def_joykey = platform_keys[i].joykey; - g_settings.input.binds[port][i].joykey = g_settings.input.binds[port][i].def_joykey; - } + strlcpy(g_settings.input.device_names[port], "PSP", sizeof(g_settings.input.device_names[port])); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_B].def_joykey = (RETRO_DEVICE_ID_JOYPAD_B); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_Y].def_joykey = (RETRO_DEVICE_ID_JOYPAD_Y); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_SELECT].def_joykey = (RETRO_DEVICE_ID_JOYPAD_SELECT); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_START].def_joykey = (RETRO_DEVICE_ID_JOYPAD_START); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_UP].def_joykey = (RETRO_DEVICE_ID_JOYPAD_UP); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_DOWN].def_joykey = (RETRO_DEVICE_ID_JOYPAD_DOWN); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_LEFT].def_joykey = (RETRO_DEVICE_ID_JOYPAD_LEFT); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_RIGHT].def_joykey = (RETRO_DEVICE_ID_JOYPAD_RIGHT); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_A].def_joykey = (RETRO_DEVICE_ID_JOYPAD_A); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_X].def_joykey = (RETRO_DEVICE_ID_JOYPAD_X); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_L].def_joykey = (RETRO_DEVICE_ID_JOYPAD_L); + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_R].def_joykey = (RETRO_DEVICE_ID_JOYPAD_R); + g_settings.input.binds[port][RARCH_ANALOG_LEFT_X_PLUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_LEFT_X_MINUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_LEFT_Y_PLUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_LEFT_Y_MINUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_X_PLUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_X_MINUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_Y_PLUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_Y_MINUS].def_joykey = NO_BTN; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_B].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_Y].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_SELECT].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_START].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_UP].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_DOWN].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_LEFT].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_RIGHT].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_A].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_X].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_L].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_R].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_L2].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_R2].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_L3].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RETRO_DEVICE_ID_JOYPAD_R3].def_joyaxis = AXIS_NONE; + g_settings.input.binds[port][RARCH_ANALOG_LEFT_X_PLUS].def_joyaxis = AXIS_POS(0); + g_settings.input.binds[port][RARCH_ANALOG_LEFT_X_MINUS].def_joyaxis = AXIS_NEG(0); + g_settings.input.binds[port][RARCH_ANALOG_LEFT_Y_PLUS].def_joyaxis = AXIS_POS(1); + g_settings.input.binds[port][RARCH_ANALOG_LEFT_Y_MINUS].def_joyaxis = AXIS_NEG(1); + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_X_PLUS].def_joyaxis = AXIS_POS(2); + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_X_MINUS].def_joyaxis = AXIS_NEG(2); + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_Y_PLUS].def_joyaxis = AXIS_POS(3); + g_settings.input.binds[port][RARCH_ANALOG_RIGHT_Y_MINUS].def_joyaxis = AXIS_NEG(3); } } @@ -165,18 +260,7 @@ static void* psp_input_initialize(void) static bool psp_input_key_pressed(void *data, int key) { - (void)data; - - switch (key) - { -#if 0 - case RARCH_QUIT_KEY: - RARCH_LOG("Got to here once.\n"); - return true; -#endif - default: - return false; - } + return (g_extern.lifecycle_state & (1ULL << key)); } static uint64_t psp_input_get_capabilities(void *data) @@ -188,6 +272,11 @@ static uint64_t psp_input_get_capabilities(void *data) return caps; } +static const rarch_joypad_driver_t *psp_input_get_joypad_driver(void *data) +{ + return &psp_joypad; +} + const input_driver_t input_psp = { psp_input_initialize, psp_input_poll, @@ -199,4 +288,92 @@ const input_driver_t input_psp = { NULL, psp_input_get_capabilities, "psp", + NULL, + NULL, + psp_input_get_joypad_driver, +}; + +static bool psp_joypad_init(void) +{ + return true; +} + +static bool psp_joypad_button(unsigned port_num, uint16_t joykey) +{ + psp_input_t *psp = (psp_input_t*)driver.input_data; + + if (port_num >= MAX_PADS) + return false; + + return psp->pad_state[port_num] & (1ULL << joykey); +} + +static int16_t psp_joypad_axis(unsigned port_num, uint32_t joyaxis) +{ + psp_input_t *psp = (psp_input_t*)driver.input_data; + if (joyaxis == AXIS_NONE || port_num >= MAX_PADS) + return 0; + + int val = 0; + + int axis = -1; + bool is_neg = false; + bool is_pos = false; + + if (AXIS_NEG_GET(joyaxis) < 4) + { + axis = AXIS_NEG_GET(joyaxis); + is_neg = true; + } + else if (AXIS_POS_GET(joyaxis) < 4) + { + axis = AXIS_POS_GET(joyaxis); + is_pos = true; + } + + switch (axis) + { + case 0: val = psp->analog_state[port_num][0][0]; break; + case 1: val = psp->analog_state[port_num][0][1]; break; + case 2: val = psp->analog_state[port_num][1][0]; break; + case 3: val = psp->analog_state[port_num][1][1]; break; + } + + if (is_neg && val > 0) + val = 0; + else if (is_pos && val < 0) + val = 0; + + return val; +} + +static void psp_joypad_poll(void) +{ +} + +static bool psp_joypad_query_pad(unsigned pad) +{ + psp_input_t *psp = (psp_input_t*)driver.input_data; + return pad < MAX_PLAYERS && psp->pad_state[pad]; +} + +static const char *psp_joypad_name(unsigned pad) +{ + return NULL; +} + +static void psp_joypad_destroy(void) +{ +} + +const rarch_joypad_driver_t psp_joypad = { + psp_joypad_init, + psp_joypad_query_pad, + psp_joypad_destroy, + psp_joypad_button, + psp_joypad_axis, + psp_joypad_poll, + NULL, + psp_joypad_name, + "psp", };