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

Turn g_udev static

Browse Source
This commit is contained in:
twinaphex 2015-11-30 16:52:29 +01:00
parent 28602d84af
commit 62260cf892
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
input/common/udev_common.c
View File

@ -6,7 +6,7 @@
static bool udev_mon_inited; static bool udev_mon_inited;
static struct udev_monitor *g_udev_mon; static struct udev_monitor *g_udev_mon;
struct udev *g_udev; static struct udev *g_udev;
bool udev_mon_new(void) bool udev_mon_new(void)
{ {
@ -61,3 +61,15 @@ struct udev_device *udev_mon_receive_device(void)
{ {
return udev_monitor_receive_device(g_udev_mon); return udev_monitor_receive_device(g_udev_mon);
} }
struct udev_enumerate *udev_mon_enumerate(void)
{
return udev_enumerate_new(g_udev);
}
/* Get the filename of the /sys entry for the device
* and create a udev_device object (dev) representing it. */
struct udev_device *udev_mon_device_new(const char *name)
{
return udev_device_new_from_syspath(g_udev, name);
}

6
input/common/udev_common.h
View File

@ -21,8 +21,6 @@
#include <boolean.h> #include <boolean.h>
extern struct udev *g_udev;
bool udev_mon_new(void); bool udev_mon_new(void);
void udev_mon_free(bool is_joypad); void udev_mon_free(bool is_joypad);
@ -31,4 +29,8 @@ bool udev_mon_hotplug_available(void);
struct udev_device *udev_mon_receive_device(void); struct udev_device *udev_mon_receive_device(void);
struct udev_enumerate *udev_mon_enumerate(void);
struct udev_device *udev_mon_device_new(const char *name);
#endif #endif

11
input/drivers/udev_input.c
View File

@ -580,7 +580,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 *devs = NULL;
struct udev_list_entry *item = NULL; struct udev_list_entry *item = NULL;
struct udev_enumerate *enumerate = udev_enumerate_new(g_udev); struct udev_enumerate *enumerate = udev_mon_enumerate();
if (!enumerate) if (!enumerate)
return false; return false;
@ -591,12 +591,9 @@ static bool open_devices(udev_input_t *udev, const char *type, device_handle_cb
for (item = devs; item; item = udev_list_entry_get_next(item)) for (item = devs; item; item = udev_list_entry_get_next(item))
{ {
const char *name = udev_list_entry_get_name(item); const char *name = udev_list_entry_get_name(item);
struct udev_device *dev = udev_mon_device_new(name);
/* Get the filename of the /sys entry for the device const char *devnode = udev_device_get_devnode(dev);
* and create a udev_device object (dev) representing it. */
struct udev_device *dev = udev_device_new_from_syspath(g_udev, name);
const char *devnode = udev_device_get_devnode(dev);
if (devnode) if (devnode)
{ {

4
input/drivers_joypad/udev_joypad.c
View File

@ -518,7 +518,7 @@ static bool udev_joypad_init(void *data)
if (!udev_mon_new()) if (!udev_mon_new())
goto error; goto error;
enumerate = udev_enumerate_new(g_udev); enumerate = udev_mon_enumerate();
if (!enumerate) if (!enumerate)
goto error; goto error;
@ -529,7 +529,7 @@ static bool udev_joypad_init(void *data)
for (item = devs; item; item = udev_list_entry_get_next(item)) for (item = devs; item; item = udev_list_entry_get_next(item))
{ {
const char *name = udev_list_entry_get_name(item); const char *name = udev_list_entry_get_name(item);
struct udev_device *dev = udev_device_new_from_syspath(g_udev, name); struct udev_device *dev = udev_mon_device_new(name);
const char *devnode = udev_device_get_devnode(dev); const char *devnode = udev_device_get_devnode(dev);
if (devnode) if (devnode)