From ace0e3eb90bc63c0de19f31b44319bd5eb680291 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 28 Aug 2020 19:58:13 +0200 Subject: [PATCH] Cleanups --- input/drivers/psp_input.c | 6 ++---- input/drivers/qnx_input.c | 9 ++++++--- input/drivers/rwebinput_input.c | 10 ++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index f919c2bf93..42771e44ef 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -349,12 +349,10 @@ static void* psp_input_initialize(const char *joypad_driver) input_keymaps_init_keyboard_lut(rarch_key_map_vita); unsigned int i; - for (i = 0; i <= VITA_MAX_SCANCODE; i++) { + for (i = 0; i <= VITA_MAX_SCANCODE; i++) psp->keyboard_state[i] = false; - } - for (i = 0; i < 6; i++) { + for (i = 0; i < 6; i++) psp->prev_keys[i] = 0; - } psp->mouse_x = 0; psp->mouse_y = 0; #endif diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c index 371575e9dd..9ea8a7cf1e 100644 --- a/input/drivers/qnx_input.c +++ b/input/drivers/qnx_input.c @@ -315,14 +315,16 @@ static int qnx_discover_controllers(qnx_input_t *qnx) ret = screen_get_context_property_iv(screen_ctx, SCREEN_PROPERTY_DEVICE_COUNT, &deviceCount); - if (ret < 0) { + if (ret < 0) + { RARCH_ERR("Error querying SCREEN_PROPERTY_DEVICE_COUNT: [%d] %s\n", errno, strerror(errno)); return false; } screen_device_t* devices_found = (screen_device_t*) calloc(deviceCount, sizeof(screen_device_t)); - if (!devices_found) { + if (!devices_found) + { RARCH_ERR("Error allocating devices_found, deviceCount=%d\n", deviceCount); return false; @@ -330,7 +332,8 @@ static int qnx_discover_controllers(qnx_input_t *qnx) ret = screen_get_context_property_pv(screen_ctx, SCREEN_PROPERTY_DEVICES, (void**)devices_found); - if (ret < 0) { + if (ret < 0) + { RARCH_ERR("Error querying SCREEN_PROPERTY_DEVICES: [%d] %s\n", errno, strerror(errno)); return false; diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index c878a9ddbf..040feaa93e 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -628,7 +628,7 @@ static void rwebinput_process_keyboard_events(rwebinput_input_t *rwebinput, strnlen(key_event->code, sizeof(key_event->code))); translated_keycode = input_keymaps_translate_keysym_to_rk(keycode); - if (translated_keycode == RETROK_BACKSPACE) + if ( translated_keycode == RETROK_BACKSPACE) character = '\b'; else if (translated_keycode == RETROK_RETURN || translated_keycode == RETROK_KP_ENTER) @@ -636,15 +636,13 @@ static void rwebinput_process_keyboard_events(rwebinput_input_t *rwebinput, else if (translated_keycode == RETROK_TAB) character = '\t'; - if (translated_keycode != RETROK_UNKNOWN) { + if (translated_keycode != RETROK_UNKNOWN) input_keyboard_event(keydown, translated_keycode, character, mod, RETRO_DEVICE_KEYBOARD); - } - if (translated_keycode < RETROK_LAST && translated_keycode != RETROK_UNKNOWN) - { + if ( translated_keycode < RETROK_LAST + && translated_keycode != RETROK_UNKNOWN) rwebinput->keys[translated_keycode] = keydown; - } } static void rwebinput_input_poll(void *data)