CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-20 01:38:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expand udev_common.c

Browse Source
This commit is contained in:
twinaphex 2015-11-30 16:39:22 +01:00
parent fd91cf130e
commit 2db1197942
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/common/udev_common.c
View File

@ -1,11 +1,15 @@
#include <stdio.h>
#include "udev_common.h"
static bool udev_mon_inited;
struct udev_monitor *g_udev_mon;
struct udev *g_udev;
bool udev_mon_new(void)
{
if (udev_mon_inited)
return true;
g_udev = udev_new();
if (!g_udev)
return false;
@ -17,15 +21,22 @@ bool udev_mon_new(void)
udev_monitor_enable_receiving(g_udev_mon);
}
udev_mon_inited = true;
return true;
}
void udev_mon_free(void)
void udev_mon_free(bool is_joypad)
{
if (!udev_mon_inited || is_joypad)
return;
if (g_udev_mon)
udev_monitor_unref(g_udev_mon);
g_udev_mon = NULL;
if (g_udev)
udev_unref(g_udev);
g_udev = NULL;
g_udev_mon = NULL;
g_udev = NULL;
udev_mon_inited = false;
}

2
input/common/udev_common.h
View File

@ -26,6 +26,6 @@ extern struct udev *g_udev;
bool udev_mon_new(void);
void udev_mon_free(void);
void udev_mon_free(bool is_joypad);
#endif

33
input/drivers/udev_input.c
View File

@ -36,6 +36,7 @@
#include "../drivers_keyboard/keyboard_event_udev.h"
#include "../common/linux_common.h"
#include "../common/udev_common.h"
#include "../input_config.h"
#include "../input_joypad_driver.h"
@ -79,10 +80,6 @@ struct udev_input_device
struct udev_input
{
bool blocked;
struct udev *udev;
struct udev_monitor *monitor;
const input_device_driver_t *joypad;
int epfd;
@ -227,10 +224,10 @@ static bool udev_input_hotplug_available(udev_input_t *udev)
{
struct pollfd fds = {0};
if (!udev || !udev->monitor)
if (!udev || !g_udev_mon)
return false;
fds.fd = udev_monitor_get_fd(udev->monitor);
fds.fd = udev_monitor_get_fd(g_udev_mon);
fds.events = POLLIN;
return (poll(&fds, 1, 0) == 1) && (fds.revents & POLLIN);
@ -315,7 +312,7 @@ static void udev_input_remove_device(udev_input_t *udev, const char *devnode)
static void udev_input_handle_hotplug(udev_input_t *udev)
{
bool is_keyboard, is_mouse, is_touchpad;
struct udev_device *dev = udev_monitor_receive_device(udev->monitor);
struct udev_device *dev = udev_monitor_receive_device(g_udev_mon);
device_handle_cb cb = NULL;
const char *devtype = NULL;
const char *val_keyboard = NULL;
@ -586,10 +583,7 @@ static void udev_input_free(void *data)
}
free(udev->devices);
if (udev->monitor)
udev_monitor_unref(udev->monitor);
if (udev->udev)
udev_unref(udev->udev);
udev_mon_free(false);
udev_input_kb_free();
@ -600,7 +594,7 @@ static bool open_devices(udev_input_t *udev, const char *type, device_handle_cb
{
struct udev_list_entry *devs = NULL;
struct udev_list_entry *item = NULL;
struct udev_enumerate *enumerate = udev_enumerate_new(udev->udev);
struct udev_enumerate *enumerate = udev_enumerate_new(g_udev);
if (!enumerate)
return false;
@ -615,7 +609,7 @@ static bool open_devices(udev_input_t *udev, const char *type, device_handle_cb
/* Get the filename of the /sys entry for the device
* and create a udev_device object (dev) representing it. */
struct udev_device *dev = udev_device_new_from_syspath(udev->udev, name);
struct udev_device *dev = udev_device_new_from_syspath(g_udev, name);
const char *devnode = udev_device_get_devnode(dev);
if (devnode)
@ -644,19 +638,8 @@ static void *udev_input_init(void)
if (!udev)
return NULL;
udev->udev = udev_new();
if (!udev->udev)
{
RARCH_ERR("Failed to create udev handle.\n");
if (!udev_mon_new())
goto error;
}
udev->monitor = udev_monitor_new_from_netlink(udev->udev, "udev");
if (udev->monitor)
{
udev_monitor_filter_add_match_subsystem_devtype(udev->monitor, "input", NULL);
udev_monitor_enable_receiving(udev->monitor);
}
#ifdef HAVE_XKBCOMMON
if (init_xkb() == -1)

2
input/drivers_joypad/udev_joypad.c
View File

@ -403,7 +403,7 @@ static void udev_joypad_destroy(void)
for (i = 0; i < MAX_USERS; i++)
udev_free_pad(i);
udev_mon_free();
udev_mon_free(true);
}
static void udev_joypad_handle_hotplug(void)