libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-04 06:11:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(GX) One for loop now for both PAD and WPAD - WPAD done

Browse Source 
first
This commit is contained in:
twinaphex 2013-01-07 01:48:56 +01:00
parent 5f08c2f937
commit e563b3f1d2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gx/gx_input.c
View File

@ -272,6 +272,8 @@ static void gx_input_poll(void *data)
pad_state[2] = 0; pad_state[2] = 0;
pad_state[3] = 0; pad_state[3] = 0;
PAD_ScanPads();
#ifdef HW_RVL #ifdef HW_RVL
WPAD_ReadPending(WPAD_CHAN_ALL, NULL); WPAD_ReadPending(WPAD_CHAN_ALL, NULL);
@ -382,19 +384,11 @@ static void gx_input_poll(void *data)
if (abs(y) > JOYSTICK_THRESHOLD) if (abs(y) > JOYSTICK_THRESHOLD)
*state_cur |= y > 0 ? GX_NUNCHUK_UP : GX_NUNCHUK_DOWN; *state_cur |= y > 0 ? GX_NUNCHUK_UP : GX_NUNCHUK_DOWN;
} }
}
#endif
PAD_ScanPads();
for (unsigned port = 0; port < MAX_PADS; port++)
{
if (!(SI_GetType(port) & SI_TYPE_GC)) if (!(SI_GetType(port) & SI_TYPE_GC))
continue; continue;
uint64_t *state_cur = &pad_state[port]; down = PAD_ButtonsHeld(port);
uint16_t down = PAD_ButtonsHeld(port);
*state_cur |= (down & PAD_BUTTON_A) ? GX_GC_A : 0; *state_cur |= (down & PAD_BUTTON_A) ? GX_GC_A : 0;
*state_cur |= (down & PAD_BUTTON_B) ? GX_GC_B : 0; *state_cur |= (down & PAD_BUTTON_B) ? GX_GC_B : 0;
@ -431,6 +425,7 @@ static void gx_input_poll(void *data)
if ((*state_cur & (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) == (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) if ((*state_cur & (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) == (GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER))
*state_cur |= GX_WIIMOTE_HOME; *state_cur |= GX_WIIMOTE_HOME;
} }
#endif
g_extern.lifecycle_state &= ~((1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_REWIND) g_extern.lifecycle_state &= ~((1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_REWIND)
| (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_RMENU_TOGGLE) | (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE)); | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_RMENU_TOGGLE) | (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE));