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

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>

diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index fea37a3..fde4b6a 100644 (file)
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -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;

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 7ffabac..cdf84be 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11315
+#define LIBUSB_NANO 11316