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

linuxraw_joypad.c - cleanup

Browse Source
This commit is contained in:
twinaphex 2016-09-25 15:11:37 +02:00
parent af98ee1c8a
commit d9d388a8fe
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
input/drivers_joypad/linuxraw_joypad.c
View File

@ -95,7 +95,8 @@ static bool linuxraw_joypad_init_pad(const char *path, struct linuxraw_joypad *p
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (ioctl(pad->fd, JSIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) >= 0) if (ioctl(pad->fd,
JSIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) >= 0)
{ {
RARCH_LOG("[Device]: Found pad: %s on %s.\n", pad->ident, path); RARCH_LOG("[Device]: Found pad: %s on %s.\n", pad->ident, path);
@ -103,7 +104,8 @@ static bool linuxraw_joypad_init_pad(const char *path, struct linuxraw_joypad *p
{ {
char msg[512] = {0}; char msg[512] = {0};
snprintf(msg, sizeof(msg), "Device #%u (%s) connected.", (unsigned)(pad - linuxraw_pads), pad->ident); snprintf(msg, sizeof(msg), "Device #%u (%s) connected.",
(unsigned)(pad - linuxraw_pads), pad->ident);
runloop_msg_queue_push(msg, 0, 60, false); runloop_msg_queue_push(msg, 0, 60, false);
} }
} }
@ -204,8 +206,11 @@ retry:
for (i = 0; i < ret; i++) for (i = 0; i < ret; i++)
{ {
if (events[i].data.ptr) struct linuxraw_joypad *ptr = (struct linuxraw_joypad*)
linuxraw_poll_pad((struct linuxraw_joypad*)events[i].data.ptr); events[i].data.ptr;
if (ptr)
linuxraw_poll_pad(ptr);
else else
handle_plugged_pad(); handle_plugged_pad();
} }
@ -214,18 +219,16 @@ retry:
static bool linuxraw_joypad_init(void *data) static bool linuxraw_joypad_init(void *data)
{ {
unsigned i; unsigned i;
settings_t *settings = config_get_ptr();
if (!epoll_new(true)) if (!epoll_new(true))
return false; return false;
(void)data;
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
{ {
char path[PATH_MAX_LENGTH] = {0}; char path[PATH_MAX_LENGTH] = {0};
autoconfig_params_t params = {{0}}; autoconfig_params_t params = {{0}};
struct linuxraw_joypad *pad = (struct linuxraw_joypad*)&linuxraw_pads[i]; struct linuxraw_joypad *pad = (struct linuxraw_joypad*)&linuxraw_pads[i];
settings_t *settings = config_get_ptr();
params.idx = i; params.idx = i;
pad->fd = -1; pad->fd = -1;
@ -286,13 +289,17 @@ static void linuxraw_joypad_destroy(void)
static bool linuxraw_joypad_button(unsigned port, uint16_t joykey) static bool linuxraw_joypad_button(unsigned port, uint16_t joykey)
{ {
const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)&linuxraw_pads[port]; const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)
&linuxraw_pads[port];
return joykey < NUM_BUTTONS && BIT64_GET(pad->buttons, joykey); return joykey < NUM_BUTTONS && BIT64_GET(pad->buttons, joykey);
} }
static uint64_t linuxraw_joypad_get_buttons(unsigned port) static uint64_t linuxraw_joypad_get_buttons(unsigned port)
{ {
const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)&linuxraw_pads[port]; const struct linuxraw_joypad *pad = (const struct linuxraw_joypad*)
&linuxraw_pads[port];
return pad->buttons; return pad->buttons;
} }