libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-08 02:17:13 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(CTR) Don't depend on global state in input driver

Browse Source
This commit is contained in:
twinaphex 2015-07-10 18:51:04 +02:00
parent 2698d4622a
commit 2eab572773
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/drivers/ctr_input.c
View File

@ -29,6 +29,7 @@ typedef struct ctr_input
{
bool blocked;
const input_device_driver_t *joypad;
uint64_t lifecycle_state;
} ctr_input_t;
static void ctr_input_poll(void *data)
@ -84,10 +85,9 @@ static void* ctr_input_initialize(void)
static bool ctr_input_key_pressed(void *data, int key)
{
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
ctr_input_t *ctr = (ctr_input_t*)data;
return (global->lifecycle_state & (1ULL << key)) ||
return (ctr->lifecycle_state & (1ULL << key)) ||
input_joypad_pressed(ctr->joypad, 0, settings->input.binds[0], key);
}

13
input/drivers_joypad/ctr_joypad.c
View File

@ -121,11 +121,10 @@ static int16_t ctr_joypad_axis(unsigned port_num, uint32_t joyaxis)
static void ctr_joypad_poll(void)
{
int32_t ret;
unsigned i, j;
uint32_t state_tmp;
circlePosition state_tmp_analog;
global_t *global = global_get_ptr();
uint64_t *lifecycle_state = (uint64_t*)&global->lifecycle_state;
ctr_input_t *ctr = (ctr_input_t*)input_driver_get_ptr();
hidScanInput();
@ -151,15 +150,15 @@ static void ctr_joypad_poll(void)
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_X] = (state_tmp_analog.dx * 200);
analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT] [RETRO_DEVICE_ID_ANALOG_Y] = -(state_tmp_analog.dy * 200);
for (int i = 0; i < 2; i++)
for (int j = 0; j < 2; j++)
for (i = 0; i < 2; i++)
for (j = 0; j < 2; j++)
if (analog_state[0][i][j] == -0x8000)
analog_state[0][i][j] = -0x7fff;
*lifecycle_state &= ~((1ULL << RARCH_MENU_TOGGLE));
ctr->lifecycle_state &= ~((1ULL << RARCH_MENU_TOGGLE));
if(state_tmp & KEY_TOUCH)
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
ctr->lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
/* panic button */
if((state_tmp & KEY_START) &&