mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

add back missing code from c5bdc02

Browse Source
This commit is contained in:
Brad Parker 2017-11-29 10:35:52 -05:00
parent aa1f95b3d5
commit 42e81dcef4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/drivers_hid/libusb_hid.c
View File

@ -441,18 +441,20 @@ static const char *libusb_hid_joypad_name(void *data, unsigned pad)
return NULL; return NULL;
} }
static uint64_t libusb_hid_joypad_get_buttons(void *data, unsigned port) static void libusb_hid_joypad_get_buttons(void *data, unsigned port, retro_bits_t *state)
{ {
libusb_hid_t *hid = (libusb_hid_t*)data; libusb_hid_t *hid = (libusb_hid_t*)data;
if (hid) if (hid)
return pad_connection_get_buttons(&hid->slots[port], port); return pad_connection_get_buttons(&hid->slots[port], port, state);
return 0; else
RARCH_INPUT_STATE_CLEAR_PTR(state);
} }
static bool libusb_hid_joypad_button(void *data, static bool libusb_hid_joypad_button(void *data,
unsigned port, uint16_t joykey) unsigned port, uint16_t joykey)
{ {
uint64_t buttons = libusb_hid_joypad_get_buttons(data, port); retro_bits_t buttons;
libusb_hid_joypad_get_buttons(data, port, &buttons);
/* Check hat. */ /* Check hat. */
if (GET_HAT_DIR(joykey)) if (GET_HAT_DIR(joykey))
@ -460,7 +462,7 @@ static bool libusb_hid_joypad_button(void *data,
/* Check the button. */ /* Check the button. */
if ((port < MAX_USERS) && (joykey < 32)) if ((port < MAX_USERS) && (joykey < 32))
return ((buttons & (1 << joykey)) != 0); return (RARCH_INPUT_STATE_BIT_GET(buttons, joykey) != 0);
return false; return false;
} }