RPCS3/libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-07-19 21:03:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

os/darwin: remove code that changed the device class used

Browse Source 
To support macOS El Capitan I added some code to change from using the
IOUSBDevice class to using IOUSBHostDevice. This looked necessary as
Apple had re-writed IOUSBFamily and IOUSBHostDevice was the new base
class name. The problem is that using the new class misses some
devices in more recent versions of macOS. Apple is still including the
IOClassNameOverride property (as of macOS Mojave) so it is still safe
to search using the IOUSBDevice class. We will need to find a
different class if Apple ever removes the IOClassNameOverride
property from USB devices.

Closes #428

Signed-off-by: Nathan Hjelm <hjelmn@mac.com>
This commit is contained in:
Nathan Hjelm
2018-10-17 12:02:14 -06:00
parent c14ab5fc4d
commit 044a7eeb75
2 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libusb/os/darwin_usb.c
+1 -24
View File
@@ -75,8 +75,6 @@ static volatile int32_t initCount = 0;
static pthread_mutex_t libusb_darwin_at_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t libusb_darwin_at_cond = PTHREAD_COND_INITIALIZER;
static pthread_once_t darwin_init_once = PTHREAD_ONCE_INIT;
#if !OSX_USE_CLOCK_GETTIME
static clock_serv_t clock_realtime;
static clock_serv_t clock_monotonic;
@@ -516,30 +514,9 @@ static void __attribute__((destructor)) _darwin_finalize(void) {
usbi_mutex_unlock(&darwin_cached_devices_lock);
}
static void darwin_check_version (void) {
/* adjust for changes in the USB stack in xnu 15 */
int sysctl_args[] = {CTL_KERN, KERN_OSRELEASE};
long version;
char version_string[256] = {'\0',};
size_t length = 256;
sysctl(sysctl_args, 2, version_string, &length, NULL, 0);
errno = 0;
version = strtol (version_string, NULL, 10);
if (0 == errno && version >= 15) {
darwin_device_class = "IOUSBHostDevice";
}
}
static int darwin_init(struct libusb_context *ctx) {
int rc;
rc = pthread_once (&darwin_init_once, darwin_check_version);
if (rc) {
return LIBUSB_ERROR_OTHER;
}
rc = darwin_scan_devices (ctx);
if (LIBUSB_SUCCESS != rc) {
return rc;
@@ -894,7 +871,7 @@ static int get_device_parent_sessionID(io_service_t service, UInt64 *parent_sess
/* Walk up the tree in the IOService plane until we find a parent that has a sessionID */
parent = service;
while((result = IORegistryEntryGetParentEntry (parent, kIOServicePlane, &parent)) == kIOReturnSuccess) {
while((result = IORegistryEntryGetParentEntry (parent, kIOUSBPlane, &parent)) == kIOReturnSuccess) {
if (get_ioregistry_value_number (parent, CFSTR("sessionID"), kCFNumberSInt64Type, parent_sessionID)) {
/* Success */
return 1;
libusb/version_nano.h
+1 -1
View File
@@ -1 +1 @@
#define LIBUSB_NANO 11315
#define LIBUSB_NANO 11316