From 544f1ba41ed23e2d001d3aeeeb84b7a937de0033 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 5 Oct 2014 17:19:25 +0200 Subject: [PATCH] Move most joystick code over to ps3_input_joypad.c --- input/ps3_input.c | 220 ++++++++++----------------------------- input/ps3_input_joypad.c | 125 ++++++++++++++++++++-- 2 files changed, 176 insertions(+), 169 deletions(-) diff --git a/input/ps3_input.c b/input/ps3_input.c index 5371592eac..abe8bc6cbc 100644 --- a/input/ps3_input.c +++ b/input/ps3_input.c @@ -45,122 +45,18 @@ typedef struct typedef struct ps3_input { - uint64_t pad_state[MAX_PADS]; - int16_t analog_state[MAX_PADS][2][2]; - unsigned pads_connected; #ifdef HAVE_MOUSE unsigned mice_connected; #endif - sensor_t accelerometer_state[MAX_PADS]; const rarch_joypad_driver_t *joypad; } ps3_input_t; -static inline int16_t convert_u8_to_s16(uint8_t val) -{ - if (val == 0) - return -0x7fff; - return val * 0x0101 - 0x8000; -} - static void ps3_input_poll(void *data) { - CellPadInfo2 pad_info; ps3_input_t *ps3 = (ps3_input_t*)data; - uint64_t *lifecycle_state = (uint64_t*)&g_extern.lifecycle_state; - if (!ps3) - return; - - for (unsigned port = 0; port < MAX_PADS; port++) - { - static CellPadData state_tmp; - cellPadGetData(port, &state_tmp); - - if (state_tmp.len != 0) - { - uint64_t *state_cur = &ps3->pad_state[port]; - *state_cur = 0; -#ifdef __PSL1GHT__ - *state_cur |= (state_tmp.BTN_LEFT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; - *state_cur |= (state_tmp.BTN_DOWN) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; - *state_cur |= (state_tmp.BTN_RIGHT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; - *state_cur |= (state_tmp.BTN_UP) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) : 0; - *state_cur |= (state_tmp.BTN_START) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_START) : 0; - *state_cur |= (state_tmp.BTN_R3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R3) : 0; - *state_cur |= (state_tmp.BTN_L3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L3) : 0; - *state_cur |= (state_tmp.BTN_SELECT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0; - *state_cur |= (state_tmp.BTN_TRIANGLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_X) : 0; - *state_cur |= (state_tmp.BTN_SQUARE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_Y) : 0; - *state_cur |= (state_tmp.BTN_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0; - *state_cur |= (state_tmp.BTN_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : 0; - *state_cur |= (state_tmp.BTN_R1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R) : 0; - *state_cur |= (state_tmp.BTN_L1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L) : 0; - *state_cur |= (state_tmp.BTN_R2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R2) : 0; - *state_cur |= (state_tmp.BTN_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; -#else - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_LEFT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_DOWN) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_RIGHT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_UP) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_START) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_START) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_R3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R3) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_L3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L3) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_SELECT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_TRIANGLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_X) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_SQUARE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_Y) : 0; - - if (g_extern.is_menu) - { - int value = 0; - if (cellSysutilGetSystemParamInt(CELL_SYSUTIL_SYSTEMPARAM_ID_ENTER_BUTTON_ASSIGN, &value) == 0) - { - if (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CROSS) - *state_cur |= (value == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : (1ULL << RETRO_DEVICE_ID_JOYPAD_B); - if (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CIRCLE) - *state_cur |= (value == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : (1ULL << RETRO_DEVICE_ID_JOYPAD_B); - } - } - else - { - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : 0; - } - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_R1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_R2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R2) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; - *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; - //RARCH_LOG("lsx : %d (%hd) lsy : %d (%hd) rsx : %d (%hd) rsy : %d (%hd)\n", lsx, ls_x, lsy, ls_y, rsx, rs_x, rsy, rs_y); - uint8_t lsx = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X]); - uint8_t lsy = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y]); - uint8_t rsx = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X]); - uint8_t rsy = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y]); - ps3->analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT ][RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(lsx); - ps3->analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT ][RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(lsy); - ps3->analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(rsx); - ps3->analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(rsy); - - ps3->accelerometer_state[port].x = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_X]; - ps3->accelerometer_state[port].y = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_Y]; - ps3->accelerometer_state[port].z = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_Z]; -#endif - } - - for (int i = 0; i < 2; i++) - for (int j = 0; j < 2; j++) - if (ps3->analog_state[port][i][j] == -0x8000) - ps3->analog_state[port][i][j] = -0x7fff; - } - - uint64_t *state_p1 = &ps3->pad_state[0]; - - *lifecycle_state &= ~((1ULL << RARCH_MENU_TOGGLE)); - - if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) - *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); - - cellPadGetInfo2(&pad_info); - ps3->pads_connected = pad_info.now_connect; + if (ps3 && ps3->joypad) + ps3->joypad->poll(); #ifdef HAVE_MOUSE CellMouseInfo mouse_info; @@ -170,30 +66,28 @@ static void ps3_input_poll(void *data) } #ifdef HAVE_MOUSE - -static int16_t ps3_mouse_device_state(void *data, unsigned player, unsigned id) +static int16_t ps3_mouse_device_state(ps3_input_t *ps3, + unsigned player, unsigned id) { CellMouseData mouse_state; - ps3_input_t *ps3 = (ps3_input_t*)data; cellMouseGetData(id, &mouse_state); - if (!ps3) - return 0; - switch (id) { /* TODO: mouse wheel up/down */ case RETRO_DEVICE_ID_MOUSE_LEFT: - return (!ps3->mice_connected ? 0 : mouse_state.buttons & CELL_MOUSE_BUTTON_1); + return (!ps3->mice_connected ? 0 : + mouse_state.buttons & CELL_MOUSE_BUTTON_1); case RETRO_DEVICE_ID_MOUSE_RIGHT: - return (!ps3->mice_connected ? 0 : mouse_state.buttons & CELL_MOUSE_BUTTON_2); + return (!ps3->mice_connected ? 0 : + mouse_state.buttons & CELL_MOUSE_BUTTON_2); case RETRO_DEVICE_ID_MOUSE_X: return (!ps3->mice_connected ? 0 : mouse_state.x_axis); case RETRO_DEVICE_ID_MOUSE_Y: return (!ps3->mice_connected ? 0 : mouse_state.y_axis); - default: - return 0; } + + return 0; } #endif @@ -203,61 +97,54 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds, unsigned index, unsigned id) { ps3_input_t *ps3 = (ps3_input_t*)data; - int16_t retval = 0; if (!ps3) return 0; - if (port < ps3->pads_connected) + switch (device) { - switch (device) - { - case RETRO_DEVICE_JOYPAD: - return input_joypad_pressed(ps3->joypad, port, binds[port], id); - case RETRO_DEVICE_ANALOG: - return input_joypad_analog(ps3->joypad, port, index, id, binds[port]); + case RETRO_DEVICE_JOYPAD: + return input_joypad_pressed(ps3->joypad, port, binds[port], id); + case RETRO_DEVICE_ANALOG: + return input_joypad_analog(ps3->joypad, port, index, id, binds[port]); #if 0 - case RETRO_DEVICE_SENSOR_ACCELEROMETER: - switch (id) - { - // fixed range of 0x000 - 0x3ff - case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X: - retval = ps3->accelerometer_state[port].x; - break; - case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Y: - retval = ps3->accelerometer_state[port].y; - break; - case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Z: - retval = ps3->accelerometer_state[port].z; - break; - default: - retval = 0; - } - break; + case RETRO_DEVICE_SENSOR_ACCELEROMETER: + switch (id) + { + // fixed range of 0x000 - 0x3ff + case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X: + retval = ps3->accelerometer_state[port].x; + break; + case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Y: + retval = ps3->accelerometer_state[port].y; + break; + case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Z: + retval = ps3->accelerometer_state[port].z; + break; + default: + retval = 0; + } + break; #endif #ifdef HAVE_MOUSE - case RETRO_DEVICE_MOUSE: - retval = ps3_mouse_device_state(data, port, id); - break; + case RETRO_DEVICE_MOUSE: + return ps3_mouse_device_state(data, port, id); #endif - default: - return 0; - } } - return retval; + return 0; } static void ps3_input_free_input(void *data) { ps3_input_t *ps3 = (ps3_input_t*)data; + if (!ps3) return; if (ps3->joypad) ps3->joypad->destroy(); - cellPadEnd(); #ifdef HAVE_MOUSE cellMouseEnd(); #endif @@ -271,35 +158,39 @@ static void* ps3_input_init(void) if (!ps3) return NULL; - cellPadInit(MAX_PADS); + ps3->joypad = input_joypad_init_driver(g_settings.input.joypad_driver); + + if (ps3->joypad) + ps3->joypad->init(); + #ifdef HAVE_MOUSE cellMouseInit(MAX_MICE); #endif - - ps3->joypad = input_joypad_init_driver(g_settings.input.joypad_driver); return ps3; } static bool ps3_input_key_pressed(void *data, int key) { ps3_input_t *ps3 = (ps3_input_t*)data; - return (g_extern.lifecycle_state & (1ULL << key)) || input_joypad_pressed(ps3->joypad, 0, g_settings.input.binds[0], key); + if (ps3) + return (g_extern.lifecycle_state & (1ULL << key)) || + input_joypad_pressed(ps3->joypad, 0, g_settings.input.binds[0], key); + return false; } static uint64_t ps3_input_get_capabilities(void *data) { - uint64_t caps = 0; - - caps |= (1 << RETRO_DEVICE_JOYPAD); + (void)data; + return #ifdef HAVE_MOUSE - caps |= (1 << RETRO_DEVICE_MOUSE); + (1 << RETRO_DEVICE_MOUSE) | #endif - caps |= (1 << RETRO_DEVICE_ANALOG); - - return caps; + (1 << RETRO_DEVICE_JOYPAD) | + (1 << RETRO_DEVICE_ANALOG); } -static bool ps3_input_set_sensor_state(void *data, unsigned port, enum retro_sensor_action action, unsigned event_rate) +static bool ps3_input_set_sensor_state(void *data, unsigned port, + enum retro_sensor_action action, unsigned event_rate) { CellPadInfo2 pad_info; (void)event_rate; @@ -308,7 +199,9 @@ static bool ps3_input_set_sensor_state(void *data, unsigned port, enum retro_sen { case RETRO_SENSOR_ACCELEROMETER_ENABLE: cellPadGetInfo2(&pad_info); - if ((pad_info.device_capability[port] & CELL_PAD_CAPABILITY_SENSOR_MODE) != CELL_PAD_CAPABILITY_SENSOR_MODE) + if ((pad_info.device_capability[port] + & CELL_PAD_CAPABILITY_SENSOR_MODE) + != CELL_PAD_CAPABILITY_SENSOR_MODE) return false; cellPadSetPortSetting(port, CELL_PAD_SETTING_SENSOR_ON); @@ -322,7 +215,8 @@ static bool ps3_input_set_sensor_state(void *data, unsigned port, enum retro_sen } } -static bool ps3_input_set_rumble(void *data, unsigned port, enum retro_rumble_effect effect, uint16_t strength) +static bool ps3_input_set_rumble(void *data, unsigned port, + enum retro_rumble_effect effect, uint16_t strength) { CellPadActParam params; diff --git a/input/ps3_input_joypad.c b/input/ps3_input_joypad.c index 715228c1de..b97dd53ded 100644 --- a/input/ps3_input_joypad.c +++ b/input/ps3_input_joypad.c @@ -14,6 +14,20 @@ * If not, see . */ +static uint64_t pad_state[MAX_PADS]; +static int16_t analog_state[MAX_PADS][2][2]; +static unsigned pads_connected; +#if 0 +sensor_t accelerometer_state[MAX_PADS]; +#endif + +static inline int16_t convert_u8_to_s16(uint8_t val) +{ + if (val == 0) + return -0x7fff; + return val * 0x0101 - 0x8000; +} + static const char *ps3_joypad_name(unsigned pad) { return g_settings.input.device_names[pad]; @@ -23,6 +37,8 @@ static bool ps3_joypad_init(void) { unsigned autoconf_pad; + cellPadInit(MAX_PADS); + for (autoconf_pad = 0; autoconf_pad < MAX_PLAYERS; autoconf_pad++) { strlcpy(g_settings.input.device_names[autoconf_pad], @@ -45,7 +61,7 @@ static bool ps3_joypad_button(unsigned port_num, uint16_t joykey) if (!ps3 || port_num >= MAX_PADS) return false; - return ps3->pad_state[port_num] & (1ULL << joykey); + return pad_state[port_num] & (1ULL << joykey); } static int16_t ps3_joypad_axis(unsigned port_num, uint32_t joyaxis) @@ -75,16 +91,16 @@ static int16_t ps3_joypad_axis(unsigned port_num, uint32_t joyaxis) switch (axis) { case 0: - val = ps3->analog_state[port_num][0][0]; + val = analog_state[port_num][0][0]; break; case 1: - val = ps3->analog_state[port_num][0][1]; + val = analog_state[port_num][0][1]; break; case 2: - val = ps3->analog_state[port_num][1][0]; + val = analog_state[port_num][1][0]; break; case 3: - val = ps3->analog_state[port_num][1][1]; + val = analog_state[port_num][1][1]; break; } @@ -98,17 +114,114 @@ static int16_t ps3_joypad_axis(unsigned port_num, uint32_t joyaxis) static void ps3_joypad_poll(void) { + unsigned port; + CellPadInfo2 pad_info; + uint64_t *lifecycle_state = (uint64_t*)&g_extern.lifecycle_state; + + for (port = 0; port < MAX_PADS; port++) + { + static CellPadData state_tmp; + cellPadGetData(port, &state_tmp); + + if (state_tmp.len != 0) + { + uint64_t *state_cur = &pad_state[port]; + *state_cur = 0; +#ifdef __PSL1GHT__ + *state_cur |= (state_tmp.BTN_LEFT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; + *state_cur |= (state_tmp.BTN_DOWN) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; + *state_cur |= (state_tmp.BTN_RIGHT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; + *state_cur |= (state_tmp.BTN_UP) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) : 0; + *state_cur |= (state_tmp.BTN_START) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_START) : 0; + *state_cur |= (state_tmp.BTN_R3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R3) : 0; + *state_cur |= (state_tmp.BTN_L3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L3) : 0; + *state_cur |= (state_tmp.BTN_SELECT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0; + *state_cur |= (state_tmp.BTN_TRIANGLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_X) : 0; + *state_cur |= (state_tmp.BTN_SQUARE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_Y) : 0; + *state_cur |= (state_tmp.BTN_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0; + *state_cur |= (state_tmp.BTN_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : 0; + *state_cur |= (state_tmp.BTN_R1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R) : 0; + *state_cur |= (state_tmp.BTN_L1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L) : 0; + *state_cur |= (state_tmp.BTN_R2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R2) : 0; + *state_cur |= (state_tmp.BTN_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; +#else + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_LEFT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_DOWN) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_RIGHT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_UP) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_START) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_START) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_R3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R3) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_L3) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L3) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL1] & CELL_PAD_CTRL_SELECT) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_TRIANGLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_X) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_SQUARE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_Y) : 0; + + if (g_extern.is_menu) + { + int value = 0; + if (cellSysutilGetSystemParamInt(CELL_SYSUTIL_SYSTEMPARAM_ID_ENTER_BUTTON_ASSIGN, &value) == 0) + { + if (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CROSS) + *state_cur |= (value == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + if (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CIRCLE) + *state_cur |= (value == CELL_SYSUTIL_ENTER_BUTTON_ASSIGN_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + } + } + else + { + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CROSS) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_CIRCLE) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_A) : 0; + } + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_R1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L1) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_R2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_R2) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; + *state_cur |= (state_tmp.button[CELL_PAD_BTN_OFFSET_DIGITAL2] & CELL_PAD_CTRL_L2) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_L2) : 0; + //RARCH_LOG("lsx : %d (%hd) lsy : %d (%hd) rsx : %d (%hd) rsy : %d (%hd)\n", lsx, ls_x, lsy, ls_y, rsx, rs_x, rsy, rs_y); + uint8_t lsx = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X]); + uint8_t lsy = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y]); + uint8_t rsx = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X]); + uint8_t rsy = (uint8_t)(state_tmp.button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y]); + analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT ][RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(lsx); + analog_state[port][RETRO_DEVICE_INDEX_ANALOG_LEFT ][RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(lsy); + analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = convert_u8_to_s16(rsx); + analog_state[port][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_Y] = convert_u8_to_s16(rsy); + +#if 0 + accelerometer_state[port].x = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_X]; + accelerometer_state[port].y = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_Y]; + accelerometer_state[port].z = state_tmp.button[CELL_PAD_BTN_OFFSET_SENSOR_Z]; +#endif +#endif + } + + for (int i = 0; i < 2; i++) + for (int j = 0; j < 2; j++) + if (analog_state[port][i][j] == -0x8000) + analog_state[port][i][j] = -0x7fff; + } + + uint64_t *state_p1 = &pad_state[0]; + + *lifecycle_state &= ~((1ULL << RARCH_MENU_TOGGLE)); + + if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) + *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); + + cellPadGetInfo2(&pad_info); + pads_connected = pad_info.now_connect; } static bool ps3_joypad_query_pad(unsigned pad) { ps3_input_t *ps3 = (ps3_input_t*)driver.input_data; - return (ps3 && pad < MAX_PLAYERS && ps3->pad_state[pad]); + return (ps3 && pad < MAX_PLAYERS && pad_state[pad]); } static void ps3_joypad_destroy(void) { + cellPadEnd(); } rarch_joypad_driver_t ps3_joypad = {