mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Drivers joypad) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-16 14:39:31 +02:00
parent bf80376d27
commit f1ea1f1845
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
input/drivers_joypad/rwebpad_joypad.c
View File

@ -49,7 +49,7 @@ static EM_BOOL rwebpad_gamepad_cb(int event_type,
if (event_type == EMSCRIPTEN_EVENT_GAMEPADCONNECTED)
{
if(!input_autoconfigure_connect(
if (!input_autoconfigure_connect(
gamepad_event->id, /* name */
NULL, /* display name */
rwebpad_joypad.ident, /* driver */
@ -105,22 +105,18 @@ static bool rwebpad_joypad_init(void *data)
static const char *rwebpad_joypad_name(unsigned pad)
{
static EmscriptenGamepadEvent gamepad_state;
EMSCRIPTEN_RESULT r;
r = emscripten_get_gamepad_status(pad, &gamepad_state);
EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(pad, &gamepad_state);
if (r == EMSCRIPTEN_RESULT_SUCCESS)
return gamepad_state.id;
else
return "";
}
static bool rwebpad_joypad_button(unsigned port_num, uint16_t joykey)
{
EmscriptenGamepadEvent gamepad_state;
EMSCRIPTEN_RESULT r;
r = emscripten_get_gamepad_status(port_num, &gamepad_state);
EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(
port_num, &gamepad_state);
if (r == EMSCRIPTEN_RESULT_SUCCESS)
if (joykey < gamepad_state.numButtons)
@ -137,7 +133,7 @@ static void rwebpad_joypad_get_buttons(unsigned port_num, input_bits_t *state)
if (r == EMSCRIPTEN_RESULT_SUCCESS)
{
int i;
unsigned i;
for (i = 0; i < gamepad_state.numButtons; i++)
{
@ -188,9 +184,7 @@ static void rwebpad_joypad_poll(void)
static bool rwebpad_joypad_query_pad(unsigned pad)
{
EmscriptenGamepadEvent gamepad_state;
EMSCRIPTEN_RESULT r;
r = emscripten_get_gamepad_status(pad, &gamepad_state);
EMSCRIPTEN_RESULT r = emscripten_get_gamepad_status(pad, &gamepad_state);
if (r == EMSCRIPTEN_RESULT_SUCCESS)
return gamepad_state.connected == EM_TRUE;

2
input/drivers_joypad/sdl_joypad.c
View File

@ -105,7 +105,7 @@ static void sdl_pad_connect(unsigned id)
#ifdef HAVE_SDL2
SDL_JoystickGUID guid;
uint16_t *guid_ptr;
uint16_t *guid_ptr = NULL;
if (SDL_IsGameController(id))
{