(udev_input.c) Some simplifications

This commit is contained in:
twinaphex 2015-01-10 01:34:16 +01:00
parent 77e9a97d13
commit 2743638b4e

View File

@ -536,10 +536,9 @@ static int16_t udev_input_state(void *data, const struct retro_keybind **binds,
case RETRO_DEVICE_LIGHTGUN: case RETRO_DEVICE_LIGHTGUN:
return udev_lightgun_state(udev, id); return udev_lightgun_state(udev, id);
default:
return 0;
} }
return 0;
} }
static bool udev_input_bind_button_pressed(void *data, int key) static bool udev_input_bind_button_pressed(void *data, int key)
@ -633,12 +632,12 @@ static struct termios oldterm, newterm;
static void restore_terminal_input(void) static void restore_terminal_input(void)
{ {
if (oldkbmd != 0xffff) if (oldkbmd == 0xffff)
{ return;
ioctl(0, KDSKBMODE, oldkbmd);
tcsetattr(0, TCSAFLUSH, &oldterm); ioctl(0, KDSKBMODE, oldkbmd);
oldkbmd = 0xffff; tcsetattr(0, TCSAFLUSH, &oldterm);
} oldkbmd = 0xffff;
} }
static void restore_terminal_signal(int sig) static void restore_terminal_signal(int sig)
@ -842,9 +841,9 @@ static bool udev_input_set_rumble(void *data, unsigned port, enum retro_rumble_e
static const rarch_joypad_driver_t *udev_input_get_joypad_driver(void *data) static const rarch_joypad_driver_t *udev_input_get_joypad_driver(void *data)
{ {
udev_input_t *udev = (udev_input_t*)data; udev_input_t *udev = (udev_input_t*)data;
if (udev) if (!udev)
return udev->joypad; return NULL;
return NULL; return udev->joypad;
} }
input_driver_t input_udev = { input_driver_t input_udev = {