ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kill off some console-only hacks to do with lifecycle state

This commit is contained in:
twinaphex 2015-07-09 06:35:18 +02:00
parent c09cc19cfe
commit 954121b99c
7 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -519,7 +519,7 @@ static unsigned default_menu_btn_info = RETRO_DEVICE_ID_JOYPAD_SELECT;
static unsigned default_menu_btn_scroll_down = RETRO_DEVICE_ID_JOYPAD_R; static unsigned default_menu_btn_scroll_down = RETRO_DEVICE_ID_JOYPAD_R;
static unsigned default_menu_btn_scroll_up = RETRO_DEVICE_ID_JOYPAD_L; static unsigned default_menu_btn_scroll_up = RETRO_DEVICE_ID_JOYPAD_L;
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360)
static unsigned menu_toggle_gamepad_combo = 2; static unsigned menu_toggle_gamepad_combo = 2;
#else #else
static unsigned menu_toggle_gamepad_combo = 0; static unsigned menu_toggle_gamepad_combo = 0;

3
input/drivers/android_input.c
View File

@ -915,13 +915,12 @@ static bool android_input_key_pressed(void *data, int key)
{ {
android_input_t *android = (android_input_t*)data; android_input_t *android = (android_input_t*)data;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!android) if (!android)
return false; return false;
return ((global->lifecycle_state | driver->overlay_state.buttons) return (driver->overlay_state.buttons
& (1ULL << key)) || input_joypad_pressed(android->joypad, & (1ULL << key)) || input_joypad_pressed(android->joypad,
0, settings->input.binds[0], key); 0, settings->input.binds[0], key);
} }

4
input/drivers/ps3_input.c
View File

@ -178,13 +178,11 @@ static bool ps3_input_key_pressed(void *data, int key)
{ {
ps3_input_t *ps3 = (ps3_input_t*)data; ps3_input_t *ps3 = (ps3_input_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
if (!ps3) if (!ps3)
return false; return false;
return (global->lifecycle_state & (1ULL << key)) || return input_joypad_pressed(ps3->joypad, 0, settings->input.binds[0], key);
input_joypad_pressed(ps3->joypad, 0, settings->input.binds[0], key);
} }
static uint64_t ps3_input_get_capabilities(void *data) static uint64_t ps3_input_get_capabilities(void *data)

6
input/drivers/qnx_input.c
View File

@ -674,11 +674,8 @@ static void *qnx_input_init(void)
static void qnx_input_poll(void *data) static void qnx_input_poll(void *data)
{ {
global_t *global = global_get_ptr();
qnx_input_t *qnx = (qnx_input_t*)data; qnx_input_t *qnx = (qnx_input_t*)data;
global->lifecycle_state &= ~(1ULL << RARCH_MENU_TOGGLE);
/* Request and process all available BPS events. */ /* Request and process all available BPS events. */
while(true) while(true)
@ -795,9 +792,8 @@ static bool qnx_input_key_pressed(void *data, int key)
{ {
qnx_input_t *qnx = (qnx_input_t*)data; qnx_input_t *qnx = (qnx_input_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
return ((global->lifecycle_state | driver.overlay_state.buttons ) & (1ULL << key) || return (driver.overlay_state.buttons & (1ULL << key) ||
input_joypad_pressed(qnx->joypad, 0, settings->input.binds[0], key)); input_joypad_pressed(qnx->joypad, 0, settings->input.binds[0], key));
} }

4
input/drivers/xdk_xinput_input.c
View File

@ -92,10 +92,8 @@ static bool xdk_input_key_pressed(void *data, int key)
{ {
xdk_input_t *xdk = (xdk_input_t*)data; xdk_input_t *xdk = (xdk_input_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
return (global->lifecycle_state & (1ULL << key)) || return input_joypad_pressed(xdk->joypad, 0, settings->input.binds[0], key);
input_joypad_pressed(xdk->joypad, 0, settings->input.binds[0], key);
} }
static uint64_t xdk_input_get_capabilities(void *data) static uint64_t xdk_input_get_capabilities(void *data)

10
input/drivers_joypad/ps3_joypad.c
View File

@ -125,7 +125,6 @@ static void ps3_joypad_poll(void)
unsigned port; unsigned port;
CellPadInfo2 pad_info; CellPadInfo2 pad_info;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
uint64_t *lifecycle_state = (uint64_t*)&global->lifecycle_state;
cellPadGetInfo2(&pad_info); cellPadGetInfo2(&pad_info);
@ -229,15 +228,6 @@ static void ps3_joypad_poll(void)
if (analog_state[port][i][j] == -0x8000) if (analog_state[port][i][j] == -0x8000)
analog_state[port][i][j] = -0x7fff; 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);
} }
static bool ps3_joypad_query_pad(unsigned pad) static bool ps3_joypad_query_pad(unsigned pad)

10
input/drivers_joypad/xdk_joypad.c
View File

@ -135,8 +135,6 @@ static void xdk_joypad_poll(void)
#ifdef _XBOX1 #ifdef _XBOX1
unsigned int dwInsertions, dwRemovals; unsigned int dwInsertions, dwRemovals;
#endif #endif
uint64_t *state_p1 = NULL;
uint64_t *lifecycle_state = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
#if defined(_XBOX1) #if defined(_XBOX1)
@ -247,14 +245,6 @@ static void xdk_joypad_poll(void)
if (analog_state[port][i][j] == -0x8000) if (analog_state[port][i][j] == -0x8000)
analog_state[port][i][j] = -0x7fff; analog_state[port][i][j] = -0x7fff;
} }
state_p1 = &pad_state[0];
lifecycle_state = &global->lifecycle_state;
*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);
} }
static bool xdk_joypad_query_pad(unsigned pad) static bool xdk_joypad_query_pad(unsigned pad)