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

(linuxraw_joypad) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-11-30 18:20:50 +01:00
parent 7cb78cca58
commit c03e1547b1
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
input/drivers_joypad/linuxraw_joypad.c
View File

@ -41,7 +41,7 @@ struct linuxraw_joypad
}; };
static struct linuxraw_joypad linuxraw_pads[MAX_USERS]; static struct linuxraw_joypad linuxraw_pads[MAX_USERS];
static int g_notify; static int g_inotify;
static bool g_hotplug; static bool g_hotplug;
static void linuxraw_poll_pad(struct linuxraw_joypad *pad) static void linuxraw_poll_pad(struct linuxraw_joypad *pad)
@ -124,7 +124,7 @@ static void handle_plugged_pad(void)
if (!event_buf) if (!event_buf)
return; return;
while ((rc = read(g_notify, event_buf, event_size)) >= 0) while ((rc = read(g_inotify, event_buf, event_size)) >= 0)
{ {
struct inotify_event *event = (struct inotify_event*)&event_buf[0]; struct inotify_event *event = (struct inotify_event*)&event_buf[0];
@ -205,12 +205,6 @@ retry:
} }
} }
static void linuxraw_joypad_setup_notify(void)
{
fcntl(g_notify, F_SETFL, fcntl(g_notify, F_GETFL) | O_NONBLOCK);
inotify_add_watch(g_notify, "/dev/input", IN_DELETE | IN_CREATE | IN_ATTRIB);
}
static bool linuxraw_joypad_init(void *data) static bool linuxraw_joypad_init(void *data)
{ {
unsigned i; unsigned i;
@ -250,12 +244,13 @@ static bool linuxraw_joypad_init(void *data)
input_config_autoconfigure_joypad(&params); input_config_autoconfigure_joypad(&params);
} }
g_notify = inotify_init(); g_inotify = inotify_init();
if (g_notify >= 0) if (g_inotify >= 0)
{ {
linuxraw_joypad_setup_notify(); fcntl(g_inotify, F_SETFL, fcntl(g_inotify, F_GETFL) | O_NONBLOCK);
epoll_add(g_notify, NULL); inotify_add_watch(g_inotify, "/dev/input", IN_DELETE | IN_CREATE | IN_ATTRIB);
epoll_add(g_inotify, NULL);
} }
g_hotplug = true; g_hotplug = true;
@ -278,9 +273,9 @@ static void linuxraw_joypad_destroy(void)
for (i = 0; i < MAX_USERS; i++) for (i = 0; i < MAX_USERS; i++)
linuxraw_pads[i].fd = -1; linuxraw_pads[i].fd = -1;
if (g_notify >= 0) if (g_inotify >= 0)
close(g_notify); close(g_inotify);
g_notify = -1; g_inotify = -1;
epoll_free(true); epoll_free(true);