mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify udev_joypad_button

Browse Source
This commit is contained in:
twinaphex 2017-06-07 20:48:33 +02:00
parent 9a471d0ef4
commit f9061ca931
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
input/drivers_joypad/udev_joypad.c
View File

@ -568,36 +568,30 @@ error:
return false; return false;
} }
static bool udev_joypad_button_hat(const void *data, uint16_t joykey, unsigned hat_dir)
{
const struct udev_joypad *pad = (const struct udev_joypad*)data;
unsigned h = GET_HAT(joykey);
if (h >= NUM_HATS)
return false;
switch (hat_dir)
{
case HAT_LEFT_MASK:
return pad->hats[h][0] < 0;
case HAT_RIGHT_MASK:
return pad->hats[h][0] > 0;
case HAT_UP_MASK:
return pad->hats[h][1] < 0;
case HAT_DOWN_MASK:
return pad->hats[h][1] > 0;
}
return 0;
}
static bool udev_joypad_button(unsigned port, uint16_t joykey) static bool udev_joypad_button(unsigned port, uint16_t joykey)
{ {
const struct udev_joypad *pad = (const struct udev_joypad*)&udev_pads[port]; const struct udev_joypad *pad = (const struct udev_joypad*)&udev_pads[port];
unsigned hat_dir = GET_HAT_DIR(joykey); unsigned hat_dir = GET_HAT_DIR(joykey);
if (hat_dir) if (hat_dir)
return udev_joypad_button_hat(pad, joykey, hat_dir); {
unsigned h = GET_HAT(joykey);
if (h < NUM_HATS)
{
switch (hat_dir)
{
case HAT_LEFT_MASK:
return pad->hats[h][0] < 0;
case HAT_RIGHT_MASK:
return pad->hats[h][0] > 0;
case HAT_UP_MASK:
return pad->hats[h][1] < 0;
case HAT_DOWN_MASK:
return pad->hats[h][1] > 0;
}
}
return false;
}
return joykey < UDEV_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey); return joykey < UDEV_NUM_BUTTONS && BIT64_GET(pad->buttons, joykey);
} }