shadps4-emu/archived-ext-libusb
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-libusb.git synced 2026-01-31 00:55:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable linux netlink event monitoring for Android OS platform services

Browse Source 
Introducing the ANDROID_OS macro that is supposed to be set by clients
of libusb that are running on Android at the OS level.

If Android_OS is set (and HAVE_LIBUDEV is not) then linux netlink event
monitoring (and consequently hotplug functionality) is enabled. This
works for Android services or simple binaries running at the OS level as
they have the necessary permissions, in contrast to usual Android apps
(see commit 2f3bc98).

Note: the __ANDROID__ macro is set by GCC for all targets running on
Android (both OS-level services and apps).

Closes #1577

Signed-off-by: Nathan Hjelm <hjelmn@google.com>
This commit is contained in:
Radu Vele
2024-10-18 16:42:34 +02:00
committed by Nathan Hjelm
parent 7bc88c0f08
commit de38189e80
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libusb/os/linux_usbfs.h
View File

@@ -174,7 +174,17 @@ static inline int linux_start_event_monitor(void)
{
#if defined(HAVE_LIBUDEV)
return linux_udev_start_event_monitor();
#elif !defined(__ANDROID__)
/*
* __ANDROID__: preprocessor macro defined automatically by GCC for all Android
* targets (i.e. both Android native applications, and Android OS-level
* services)
*
* ANDROID_OS: compilation flag that should be set for using libusb from programs
* running on Android at OS level (e.g. Android platform services).
* The programs using libusb built with the ANDROID_OS flag must have
* permission to access netlink sockets.
*/
#elif !defined(__ANDROID__) || defined(ANDROID_OS)
return linux_netlink_start_event_monitor();
#else
return LIBUSB_SUCCESS;
@@ -185,7 +195,7 @@ static inline void linux_stop_event_monitor(void)
{
#if defined(HAVE_LIBUDEV)
linux_udev_stop_event_monitor();
#elif !defined(__ANDROID__)
#elif !defined(__ANDROID__) || defined(ANDROID_OS)
linux_netlink_stop_event_monitor();
#endif
}
@@ -194,7 +204,7 @@ static inline void linux_hotplug_poll(void)
{
#if defined(HAVE_LIBUDEV)
linux_udev_hotplug_poll();
#elif !defined(__ANDROID__)
#elif !defined(__ANDROID__) || defined(ANDROID_OS)
linux_netlink_hotplug_poll();
#endif
}

2
libusb/version_nano.h
View File

@@ -1 +1 @@
#define LIBUSB_NANO 11940
#define LIBUSB_NANO 11941