xnu-1504.7.4.tar.gz

[apple/xnu.git] / iokit / Kernel / IOService.cpp

diff --git a/iokit/Kernel/IOService.cpp b/iokit/Kernel/IOService.cpp
index 919ea16faee08e67391dd62956518c36355ab1c1..62dda56feee9f0cd4798909e052b003c1c8ffe63 100644 (file)
--- a/iokit/Kernel/IOService.cpp
+++ b/iokit/Kernel/IOService.cpp
@@ -1,58 +1,57 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1991-1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- * 29-Jan-91    Portions from IODevice.m, Doug Mitchell at NeXT, Created.
- * 18-Jun-98    start IOKit objc
- * 10-Nov-98   start iokit cpp
- * 25-Feb-99   sdouglas, add threads and locks to ensure deadlock
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
  
 #include <IOKit/system.h>
 
 #include <IOKit/IOService.h>
  */
  
 #include <IOKit/system.h>
 
 #include <IOKit/IOService.h>

+#include <libkern/OSDebug.h>

 #include <libkern/c++/OSContainers.h>
 #include <libkern/c++/OSContainers.h>

+#include <libkern/c++/OSKext.h>

 #include <libkern/c++/OSUnserialize.h>
 #include <IOKit/IOCatalogue.h>
 #include <libkern/c++/OSUnserialize.h>
 #include <IOKit/IOCatalogue.h>

+#include <IOKit/IOCommand.h>

 #include <IOKit/IODeviceMemory.h>
 #include <IOKit/IOInterrupts.h>
 #include <IOKit/IOInterruptController.h>
 #include <IOKit/IOPlatformExpert.h>
 #include <IOKit/IOMessage.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/IODeviceMemory.h>
 #include <IOKit/IOInterrupts.h>
 #include <IOKit/IOInterruptController.h>
 #include <IOKit/IOPlatformExpert.h>
 #include <IOKit/IOMessage.h>
 #include <IOKit/IOLib.h>

-#include <IOKit/IOKitKeys.h>
+#include <IOKit/IOKitKeysPrivate.h>

 #include <IOKit/IOBSD.h>
 #include <IOKit/IOUserClient.h>
 #include <IOKit/IOWorkLoop.h>
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOUserClient.h>
 #include <IOKit/IOWorkLoop.h>

+#include <IOKit/IOTimeStamp.h>

 #include <mach/sync_policy.h>
 #include <IOKit/assert.h>
 #include <sys/errno.h>
 
 #include <mach/sync_policy.h>
 #include <IOKit/assert.h>
 #include <sys/errno.h>
 

-//#define LOG kprintf
-#define LOG IOLog
+#define LOG kprintf
+//#define LOG IOLog

 
 #include "IOServicePrivate.h"
 
 
 #include "IOServicePrivate.h"
 


@@ -101,11 +100,18 @@ const OSSymbol *          gIOMatchCategoryKey;
 const OSSymbol *               gIODefaultMatchCategoryKey;
 const OSSymbol *               gIOMatchedServiceCountKey;
 
 const OSSymbol *               gIODefaultMatchCategoryKey;
 const OSSymbol *               gIOMatchedServiceCountKey;
 

+const OSSymbol *               gIOMapperIDKey;

 const OSSymbol *               gIOUserClientClassKey;
 const OSSymbol *               gIOKitDebugKey;
 
 const OSSymbol *               gIOCommandPoolSizeKey;
 
 const OSSymbol *               gIOUserClientClassKey;
 const OSSymbol *               gIOKitDebugKey;
 
 const OSSymbol *               gIOCommandPoolSizeKey;
 

+const OSSymbol *               gIOConsoleUsersKey;
+const OSSymbol *               gIOConsoleSessionUIDKey;
+const OSSymbol *               gIOConsoleUsersSeedKey;
+const OSSymbol *        gIOConsoleSessionOnConsoleKey;
+const OSSymbol *        gIOConsoleSessionSecureInputPIDKey;
+

 static int                     gIOResourceGenerationCount;
 
 const OSSymbol *               gIOServiceKey;
 static int                     gIOResourceGenerationCount;
 
 const OSSymbol *               gIOServiceKey;


@@ -141,6 +147,18 @@ static OSArray *           gIOStopList;
 static OSArray *               gIOStopProviderList;
 static OSArray *               gIOFinalizeList;
 
 static OSArray *               gIOStopProviderList;
 static OSArray *               gIOFinalizeList;
 

+static SInt32                  gIOConsoleUsersSeed;
+static OSData *                        gIOConsoleUsersSeedValue;
+
+extern const OSSymbol *                gIODTPHandleKey;
+
+const OSSymbol *               gIOPlatformSleepActionKey;
+const OSSymbol *               gIOPlatformWakeActionKey;
+const OSSymbol *               gIOPlatformQuiesceActionKey;
+const OSSymbol *               gIOPlatformActiveActionKey;
+
+const OSSymbol *               gIOPlatformFunctionHandlerSet;
+

 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #define LOCKREADNOTIFY()       \
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #define LOCKREADNOTIFY()       \


@@ -152,6 +170,8 @@ static OSArray *            gIOFinalizeList;
     IORecursiveLockUnlock( gNotificationLock )
 #define SLEEPNOTIFY(event) \
     IORecursiveLockSleep( gNotificationLock, (void *)(event), THREAD_UNINT )
     IORecursiveLockUnlock( gNotificationLock )
 #define SLEEPNOTIFY(event) \
     IORecursiveLockSleep( gNotificationLock, (void *)(event), THREAD_UNINT )

+#define SLEEPNOTIFYTO(event, deadline) \
+    IORecursiveLockSleepDeadline( gNotificationLock, (void *)(event), deadline, THREAD_UNINT )

 #define WAKEUPNOTIFY(event) \
        IORecursiveLockWakeup( gNotificationLock, (void *)(event), /* wake one */ false )
 
 #define WAKEUPNOTIFY(event) \
        IORecursiveLockWakeup( gNotificationLock, (void *)(event), /* wake one */ false )
 


@@ -162,6 +182,19 @@ static OSArray *           gIOFinalizeList;
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 

+#define queue_element(entry, element, type, field) do {        \
+       vm_address_t __ele = (vm_address_t) (entry);    \
+       __ele -= -4 + ((size_t)(&((type) 4)->field));   \
+       (element) = (type) __ele;                       \
+    } while(0)
+
+#define iterqueue(que, elt)                            \
+       for (queue_entry_t elt = queue_first(que);      \
+            !queue_end(que, elt);                      \
+            elt = queue_next(elt))
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+

 struct ArbitrationLockQueueElement {
     queue_chain_t link;
     IOThread      thread;
 struct ArbitrationLockQueueElement {
     queue_chain_t link;
     IOThread      thread;


@@ -179,6 +212,46 @@ static IOLock *     gArbitrationLockQueueLock;
 bool IOService::isInactive( void ) const
     { return( 0 != (kIOServiceInactiveState & getState())); }
 
 bool IOService::isInactive( void ) const
     { return( 0 != (kIOServiceInactiveState & getState())); }
 

+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#define IOServiceTrace(csc, a, b, c, d) {                              \
+    if(kIOTraceIOService & gIOKitDebug) {                              \
+       KERNEL_DEBUG_CONSTANT(IODBG_IOSERVICE(csc), a, b, c, d, 0);     \
+    }                                                                  \
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+// Only used by the intel implementation of
+//     IOService::requireMaxBusStall(UInt32 ns)
+//     IOService::requireMaxInterruptDelay(uint32_t ns)
+struct CpuDelayEntry
+{
+    IOService * fService;
+    UInt32      fMaxDelay;
+    UInt32      fDelayType;
+};
+
+enum {
+    kCpuDelayBusStall, kCpuDelayInterrupt,
+    kCpuNumDelayTypes
+};
+
+static OSData          *sCpuDelayData = OSData::withCapacity(8 * sizeof(CpuDelayEntry));
+static IORecursiveLock *sCpuDelayLock = IORecursiveLockAlloc();
+static OSArray         *sCpuLatencyHandlers[kCpuNumDelayTypes];
+const OSSymbol         *sCPULatencyFunctionName[kCpuNumDelayTypes];
+
+static void
+requireMaxCpuDelay(IOService * service, UInt32 ns, UInt32 delayType);
+static IOReturn
+setLatencyHandler(UInt32 delayType, IOService * target, bool enable);
+
+#endif /* defined(__i386__) || defined(__x86_64__) */
+

 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 void IOService::initialize( void )
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 void IOService::initialize( void )


@@ -213,6 +286,8 @@ void IOService::initialize( void )
     gIOInterruptSpecifiersKey
        = OSSymbol::withCStringNoCopy("IOInterruptSpecifiers");
 
     gIOInterruptSpecifiersKey
        = OSSymbol::withCStringNoCopy("IOInterruptSpecifiers");
 

+    gIOMapperIDKey = OSSymbol::withCStringNoCopy(kIOMapperIDKey);
+

     gIOKitDebugKey     = OSSymbol::withCStringNoCopy( kIOKitDebugKey );
 
     gIOCommandPoolSizeKey      = OSSymbol::withCStringNoCopy( kIOCommandPoolSizeKey );
     gIOKitDebugKey     = OSSymbol::withCStringNoCopy( kIOKitDebugKey );
 
     gIOCommandPoolSizeKey      = OSSymbol::withCStringNoCopy( kIOCommandPoolSizeKey );


@@ -235,6 +310,23 @@ void IOService::initialize( void )
                                                 kIOTerminatedNotification );
     gIOServiceKey              = OSSymbol::withCStringNoCopy( kIOServiceClass);
 
                                                 kIOTerminatedNotification );
     gIOServiceKey              = OSSymbol::withCStringNoCopy( kIOServiceClass);
 

+    gIOConsoleUsersKey         = OSSymbol::withCStringNoCopy( kIOConsoleUsersKey);
+    gIOConsoleSessionUIDKey    = OSSymbol::withCStringNoCopy( kIOConsoleSessionUIDKey);
+    gIOConsoleUsersSeedKey     = OSSymbol::withCStringNoCopy( kIOConsoleUsersSeedKey);
+    gIOConsoleSessionOnConsoleKey = OSSymbol::withCStringNoCopy( kIOConsoleSessionOnConsoleKey);
+    gIOConsoleSessionSecureInputPIDKey = OSSymbol::withCStringNoCopy( kIOConsoleSessionSecureInputPIDKey);
+    gIOConsoleUsersSeedValue   = OSData::withBytesNoCopy(&gIOConsoleUsersSeed, sizeof(gIOConsoleUsersSeed));
+
+    gIOPlatformSleepActionKey  = OSSymbol::withCStringNoCopy(kIOPlatformSleepActionKey);
+    gIOPlatformWakeActionKey   = OSSymbol::withCStringNoCopy(kIOPlatformWakeActionKey);
+    gIOPlatformQuiesceActionKey        = OSSymbol::withCStringNoCopy(kIOPlatformQuiesceActionKey);
+    gIOPlatformActiveActionKey = OSSymbol::withCStringNoCopy(kIOPlatformActiveActionKey);
+
+    gIOPlatformFunctionHandlerSet              = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerSet);
+#if defined(__i386__) || defined(__x86_64__)
+    sCPULatencyFunctionName[kCpuDelayBusStall] = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerMaxBusDelay);
+    sCPULatencyFunctionName[kCpuDelayInterrupt]        = OSSymbol::withCStringNoCopy(kIOPlatformFunctionHandlerMaxInterruptDelay);
+#endif

     gNotificationLock          = IORecursiveLockAlloc();
 
     assert( gIOServicePlane && gIODeviceMemoryKey
     gNotificationLock          = IORecursiveLockAlloc();
 
     assert( gIOServicePlane && gIODeviceMemoryKey


@@ -243,7 +335,10 @@ void IOService::initialize( void )
         && gIOProviderClassKey && gIONameMatchKey && gIONameMatchedKey
        && gIOMatchCategoryKey && gIODefaultMatchCategoryKey
         && gIOPublishNotification && gIOMatchedNotification
         && gIOProviderClassKey && gIONameMatchKey && gIONameMatchedKey
        && gIOMatchCategoryKey && gIODefaultMatchCategoryKey
         && gIOPublishNotification && gIOMatchedNotification

-        && gIOTerminatedNotification && gIOServiceKey );
+        && gIOTerminatedNotification && gIOServiceKey
+       && gIOConsoleUsersKey && gIOConsoleSessionUIDKey
+    && gIOConsoleSessionOnConsoleKey && gIOConsoleSessionSecureInputPIDKey
+       && gIOConsoleUsersSeedKey && gIOConsoleUsersSeedValue);

 
     gJobsLock  = IOLockAlloc();
     gJobs      = OSOrderedSet::withCapacity( 10 );
 
     gJobsLock  = IOLockAlloc();
     gJobs      = OSOrderedSet::withCapacity( 10 );


@@ -313,6 +408,8 @@ void IOService::stop( IOService * provider )
 
 void IOService::free( void )
 {
 
 void IOService::free( void )
 {

+    requireMaxBusStall(0);
+    requireMaxInterruptDelay(0);

     if( getPropertyTable())
         unregisterAllInterest();
     PMfree();
     if( getPropertyTable())
         unregisterAllInterest();
     PMfree();


@@ -398,7 +495,7 @@ void IOService::detach( IOService * provider )
  * Register instance - publish it for matching
  */
 
  * Register instance - publish it for matching
  */
 

-void IOService::registerService( IOOptionBits options = 0 )
+void IOService::registerService( IOOptionBits options )

 {
     char *             pathBuf;
     const char *       path;
 {
     char *             pathBuf;
     const char *       path;


@@ -451,7 +548,7 @@ void IOService::registerService( IOOptionBits options = 0 )
     startMatching( options );
 }
 
     startMatching( options );
 }
 

-void IOService::startMatching( IOOptionBits options = 0 )
+void IOService::startMatching( IOOptionBits options )

 {
     IOService *        provider;
     UInt32     prevBusy = 0;
 {
     IOService *        provider;
     UInt32     prevBusy = 0;


@@ -467,6 +564,8 @@ void IOService::startMatching( IOOptionBits options = 0 )
        || ((provider = getProvider())
                && (provider->__state[1] & kIOServiceSynchronousState));
 
        || ((provider = getProvider())
                && (provider->__state[1] & kIOServiceSynchronousState));
 

+       if ( options & kIOServiceAsynchronous )
+               sync = false;

 
     needConfig =  (0 == (__state[1] & (kIOServiceNeedConfigState | kIOServiceConfigState)))
               && (0 == (__state[0] & kIOServiceInactiveState));
 
     needConfig =  (0 == (__state[1] & (kIOServiceNeedConfigState | kIOServiceConfigState)))
               && (0 == (__state[0] & kIOServiceInactiveState));


@@ -509,7 +608,7 @@ void IOService::startMatching( IOOptionBits options = 0 )
             lockForArbitration();
             IOLockLock( gIOServiceBusyLock );
 
             lockForArbitration();
             IOLockLock( gIOServiceBusyLock );
 

-            waitAgain = (prevBusy != (__state[1] & kIOServiceBusyStateMask));
+            waitAgain = (prevBusy < (__state[1] & kIOServiceBusyStateMask));

             if( waitAgain)
                 __state[1] |= kIOServiceSyncPubState | kIOServiceBusyWaiterState;
             else
             if( waitAgain)
                 __state[1] |= kIOServiceSyncPubState | kIOServiceBusyWaiterState;
             else


@@ -531,7 +630,8 @@ void IOService::startMatching( IOOptionBits options = 0 )
 IOReturn IOService::catalogNewDrivers( OSOrderedSet * newTables )
 {
     OSDictionary *     table;
 IOReturn IOService::catalogNewDrivers( OSOrderedSet * newTables )
 {
     OSDictionary *     table;

-    OSIterator *       iter;
+    OSSet *            set;
+    OSSet *            allSet = 0;

     IOService *                service;
 #if IOMATCHDEBUG
     SInt32             count = 0;
     IOService *                service;
 #if IOMATCHDEBUG
     SInt32             count = 0;


@@ -542,32 +642,45 @@ IOReturn IOService::catalogNewDrivers( OSOrderedSet * newTables )
     while( (table = (OSDictionary *) newTables->getFirstObject())) {
 
        LOCKWRITENOTIFY();
     while( (table = (OSDictionary *) newTables->getFirstObject())) {
 
        LOCKWRITENOTIFY();

-        iter = (OSIterator *) getExistingServices( table,
-                                                    kIOServiceRegisteredState );
+        set = (OSSet *) copyExistingServices( table, 
+                                               kIOServiceRegisteredState,
+                                               kIOServiceExistingSet);

        UNLOCKNOTIFY();
        UNLOCKNOTIFY();

-       if( iter) {
-           while( (service = (IOService *) iter->getNextObject())) {
-                service->startMatching(kIOServiceAsynchronous);
+       if( set) {
+

 #if IOMATCHDEBUG
 #if IOMATCHDEBUG

-               count++;
+           count += set->getCount();

 #endif
 #endif

+           if (allSet) {
+               allSet->merge((const OSSet *) set);
+               set->release();

            }
            }

-           iter->release();
+           else
+               allSet = set;

        }
        }

+

 #if IOMATCHDEBUG
        if( getDebugFlags( table ) & kIOLogMatch)
 #if IOMATCHDEBUG
        if( getDebugFlags( table ) & kIOLogMatch)

-           LOG("Matching service count = %ld\n", count);
+           LOG("Matching service count = %ld\n", (long)count);

 #endif
        newTables->removeObject(table);
     }
 
 #endif
        newTables->removeObject(table);
     }
 

+    if (allSet) {
+       while( (service = (IOService *) allSet->getAnyObject())) {
+           service->startMatching(kIOServiceAsynchronous);
+           allSet->removeObject(service);
+       }
+       allSet->release();
+    }
+

     newTables->release();
 
     return( kIOReturnSuccess );
 }
 
  _IOServiceJob * _IOServiceJob::startJob( IOService * nub, int type,
     newTables->release();
 
     return( kIOReturnSuccess );
 }
 
  _IOServiceJob * _IOServiceJob::startJob( IOService * nub, int type,

-                                               IOOptionBits options = 0 )
+                                               IOOptionBits options )

 {
     _IOServiceJob *    job;
 
 {
     _IOServiceJob *    job;
 


@@ -749,9 +862,23 @@ IOReturn IOService::callPlatformFunction( const OSSymbol * functionName,
                                          void *param3, void *param4 )
 {
   IOReturn  result = kIOReturnUnsupported;
                                          void *param3, void *param4 )
 {
   IOReturn  result = kIOReturnUnsupported;

-  IOService *provider = getProvider();
-  
-  if (provider != 0) {
+  IOService *provider;
+
+  if (gIOPlatformFunctionHandlerSet == functionName)
+  {
+#if defined(__i386__) || defined(__x86_64__)
+    const OSSymbol * functionHandlerName = (const OSSymbol *) param1;
+    IOService *             target              = (IOService *) param2;
+    bool            enable              = (param3 != 0);
+
+    if (sCPULatencyFunctionName[kCpuDelayBusStall] == functionHandlerName)
+       result = setLatencyHandler(kCpuDelayBusStall, target, enable);
+    else if (sCPULatencyFunctionName[kCpuDelayInterrupt] == param1)
+       result = setLatencyHandler(kCpuDelayInterrupt, target, enable);
+#endif /* defined(__i386__) || defined(__x86_64__) */
+  }
+
+  if ((kIOReturnUnsupported == result) && (provider = getProvider())) {

     result = provider->callPlatformFunction(functionName, waitForFunction,
                                            param1, param2, param3, param4);
   }
     result = provider->callPlatformFunction(functionName, waitForFunction,
                                            param1, param2, param3, param4);
   }


@@ -812,7 +939,7 @@ void IOService::setPMRootDomain( class IOPMrootDomain * rootDomain)
  * Stacking change
  */
 
  * Stacking change
  */
 

-bool IOService::lockForArbitration( bool isSuccessRequired = true )
+bool IOService::lockForArbitration( bool isSuccessRequired )

 {
     bool                          found;
     bool                          success;
 {
     bool                          found;
     bool                          success;


@@ -1199,7 +1326,7 @@ void IOService::applyToClients( IOServiceApplierFunction applier,
 
 // send a message to a client or interested party of this service
 IOReturn IOService::messageClient( UInt32 type, OSObject * client,
 
 // send a message to a client or interested party of this service
 IOReturn IOService::messageClient( UInt32 type, OSObject * client,

-                                   void * argument = 0, vm_size_t argSize = 0 )
+                                   void * argument, vm_size_t argSize )

 {
     IOReturn                           ret;
     IOService *                        service;
 {
     IOReturn                           ret;
     IOService *                        service;


@@ -1247,32 +1374,49 @@ IOReturn IOService::messageClient( UInt32 type, OSObject * client,
     return( ret );
 }
 
     return( ret );
 }
 

+static void
+applyToInterestNotifiers(const IORegistryEntry *target,
+                        const OSSymbol * typeOfInterest,
+                        OSObjectApplierFunction applier,
+                        void * context )
+{
+    OSArray *          copyArray = 0;
+
+    LOCKREADNOTIFY();
+
+    IOCommand *notifyList =
+       OSDynamicCast( IOCommand, target->getProperty( typeOfInterest ));
+
+    if( notifyList) {
+        copyArray = OSArray::withCapacity(1);
+
+       // iterate over queue, entry is set to each element in the list
+       iterqueue(&notifyList->fCommandChain, entry) {
+           _IOServiceInterestNotifier * notify;
+
+           queue_element(entry, notify, _IOServiceInterestNotifier *, chain);
+           copyArray->setObject(notify);
+       }
+    }
+    UNLOCKNOTIFY();
+
+    if( copyArray) {
+       unsigned int    index;
+       OSObject *      next;
+
+       for( index = 0; (next = copyArray->getObject( index )); index++)
+           (*applier)(next, context);
+       copyArray->release();
+    }
+}
+

 void IOService::applyToInterested( const OSSymbol * typeOfInterest,
                                    OSObjectApplierFunction applier,
                                    void * context )
 {
 void IOService::applyToInterested( const OSSymbol * typeOfInterest,
                                    OSObjectApplierFunction applier,
                                    void * context )
 {

-    OSArray *          array;
-    unsigned int       index;
-    OSObject *         next;
-    OSArray *          copyArray;
-
-    applyToClients( (IOServiceApplierFunction) applier, context );
-
-    LOCKREADNOTIFY();
-    array = OSDynamicCast( OSArray, getProperty( typeOfInterest ));
-    if( array) {
-        copyArray = OSArray::withArray( array );
-        UNLOCKNOTIFY();
-        if( copyArray) {
-            for( index = 0;
-                (next = array->getObject( index ));
-                index++) {
-                (*applier)(next, context);
-            }
-            copyArray->release();
-        }
-    } else
-        UNLOCKNOTIFY();
+    if (gIOGeneralInterest == typeOfInterest)
+       applyToClients( (IOServiceApplierFunction) applier, context );
+    applyToInterestNotifiers(this, typeOfInterest, applier, context);

 }
 
 struct MessageClientsContext {
 }
 
 struct MessageClientsContext {


@@ -1296,7 +1440,7 @@ static void messageClientsApplier( OSObject * object, void * ctx )
 
 // send a message to all clients
 IOReturn IOService::messageClients( UInt32 type,
 
 // send a message to all clients
 IOReturn IOService::messageClients( UInt32 type,

-                                    void * argument = 0, vm_size_t argSize = 0 )
+                                    void * argument, vm_size_t argSize )

 {
     MessageClientsContext      context;
 
 {
     MessageClientsContext      context;
 


@@ -1322,7 +1466,6 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
                   IOServiceInterestHandler handler, void * target, void * ref )
 {
     _IOServiceInterestNotifier * notify = 0;
                   IOServiceInterestHandler handler, void * target, void * ref )
 {
     _IOServiceInterestNotifier * notify = 0;

-    OSArray *                   set;

 
     if( (typeOfInterest != gIOGeneralInterest)
      && (typeOfInterest != gIOBusyInterest)
 
     if( (typeOfInterest != gIOGeneralInterest)
      && (typeOfInterest != gIOBusyInterest)


@@ -1349,16 +1492,23 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
             ////// queue
 
             LOCKWRITENOTIFY();
             ////// queue
 
             LOCKWRITENOTIFY();

-            if( 0 == (set = (OSArray *) getProperty( typeOfInterest ))) {
-                set = OSArray::withCapacity( 1 );
-                if( set) {
-                    setProperty( typeOfInterest, set );
-                    set->release();
-                }
-            }
-            notify->whence = set;
-            if( set)
-                set->setObject( notify );
+
+           // Get the head of the notifier linked list
+           IOCommand *notifyList = (IOCommand *) getProperty( typeOfInterest );
+           if (!notifyList || !OSDynamicCast(IOCommand, notifyList)) {
+               notifyList = OSTypeAlloc(IOCommand);
+               if (notifyList) {
+                   notifyList->init();
+                   setProperty( typeOfInterest, notifyList);
+                   notifyList->release();
+               }
+           }
+
+           if (notifyList) {
+               enqueue(&notifyList->fCommandChain, &notify->chain);
+               notify->retain();       // ref'ed while in list
+           }
+

             UNLOCKNOTIFY();
         }
     }
             UNLOCKNOTIFY();
         }
     }


@@ -1367,30 +1517,30 @@ IONotifier * IOService::registerInterest( const OSSymbol * typeOfInterest,
     return( notify );
 }
 
     return( notify );
 }
 

-static void cleanInterestArray( OSObject * object )
+static void cleanInterestList( OSObject * head )

 {
 {

-    OSArray *                  array;
-    unsigned int               index;
-    _IOServiceInterestNotifier * next;
-    
-    if( (array = OSDynamicCast( OSArray, object))) {
-        LOCKWRITENOTIFY();
-        for( index = 0;
-             (next = (_IOServiceInterestNotifier *)
-                        array->getObject( index ));
-             index++) {
-            next->whence = 0;
-        }
-        UNLOCKNOTIFY();
+    IOCommand *notifyHead = OSDynamicCast(IOCommand, head);
+    if (!notifyHead)
+       return;
+
+    LOCKWRITENOTIFY();
+    while ( queue_entry_t entry = dequeue(&notifyHead->fCommandChain) ) {
+       queue_next(entry) = queue_prev(entry) = 0;
+
+       _IOServiceInterestNotifier * notify;
+
+       queue_element(entry, notify, _IOServiceInterestNotifier *, chain);
+       notify->release();

     }
     }

+    UNLOCKNOTIFY();

 }
 
 void IOService::unregisterAllInterest( void )
 {
 }
 
 void IOService::unregisterAllInterest( void )
 {

-    cleanInterestArray( getProperty( gIOGeneralInterest ));
-    cleanInterestArray( getProperty( gIOBusyInterest ));
-    cleanInterestArray( getProperty( gIOAppPowerStateInterest ));
-    cleanInterestArray( getProperty( gIOPriorityPowerStateInterest ));
+    cleanInterestList( getProperty( gIOGeneralInterest ));
+    cleanInterestList( getProperty( gIOBusyInterest ));
+    cleanInterestList( getProperty( gIOAppPowerStateInterest ));
+    cleanInterestList( getProperty( gIOPriorityPowerStateInterest ));

 }
 
 /*
 }
 
 /*


@@ -1432,10 +1582,10 @@ void _IOServiceInterestNotifier::remove()
 {
     LOCKWRITENOTIFY();
 
 {
     LOCKWRITENOTIFY();
 

-    if( whence) {
-        whence->removeObject(whence->getNextIndexOfObject(
-                                       (OSObject *) this, 0 ));
-        whence = 0;
+    if( queue_next( &chain )) {
+       remqueue( 0, &chain);
+       queue_next( &chain) = queue_prev( &chain) = 0;
+       release();

     }
 
     state &= ~kIOServiceNotifyEnable;
     }
 
     state &= ~kIOServiceNotifyEnable;


@@ -1483,7 +1633,7 @@ void _IOServiceInterestNotifier::enable( bool was )
 #define headQ(o)               setObject(0, o)
 #define TLOG(fmt, args...)     { if(kIOLogYield & gIOKitDebug) IOLog(fmt, ## args); }
 
 #define headQ(o)               setObject(0, o)
 #define TLOG(fmt, args...)     { if(kIOLogYield & gIOKitDebug) IOLog(fmt, ## args); }
 

-inline void _workLoopAction( IOWorkLoop::Action action,
+static void _workLoopAction( IOWorkLoop::Action action,

                              IOService * service,
                              void * p0 = 0, void * p1 = 0,
                              void * p2 = 0, void * p3 = 0 )
                              IOService * service,
                              void * p0 = 0, void * p1 = 0,
                              void * p2 = 0, void * p3 = 0 )


@@ -1515,7 +1665,7 @@ bool IOService::requestTerminate( IOService * provider, IOOptionBits options )
     return( ok );
 }
 
     return( ok );
 }
 

-bool IOService::terminatePhase1( IOOptionBits options = 0 )
+bool IOService::terminatePhase1( IOOptionBits options )

 {
     IOService *                victim;
     IOService *                client;
 {
     IOService *                victim;
     IOService *                client;


@@ -1525,7 +1675,15 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
     bool               didInactive;
     bool               startPhase2 = false;
 
     bool               didInactive;
     bool               startPhase2 = false;
 

-    TLOG("%s::terminatePhase1(%08lx)\n", getName(), options);
+    TLOG("%s::terminatePhase1(%08llx)\n", getName(), (long long)options);
+
+    uint64_t regID = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_PHASE1,
+       (uintptr_t) regID, 
+       (uintptr_t) (regID >> 32),
+       (uintptr_t) this,
+       (uintptr_t) options);

 
     // -- compat
     if( options & kIOServiceRecursing) {
 
     // -- compat
     if( options & kIOServiceRecursing) {


@@ -1560,16 +1718,26 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
 
             victim->deliverNotification( gIOTerminatedNotification, 0, 0xffffffff );
             IOUserClient::destroyUserReferences( victim );
 
             victim->deliverNotification( gIOTerminatedNotification, 0, 0xffffffff );
             IOUserClient::destroyUserReferences( victim );

-            victim->unregisterAllInterest();

 
             iter = victim->getClientIterator();
             if( iter) {
                 while( (client = (IOService *) iter->getNextObject())) {
 
             iter = victim->getClientIterator();
             if( iter) {
                 while( (client = (IOService *) iter->getNextObject())) {

-                    TLOG("%s::requestTerminate(%s, %08lx)\n",
-                            client->getName(), victim->getName(), options);
+                    TLOG("%s::requestTerminate(%s, %08llx)\n",
+                            client->getName(), victim->getName(), (long long)options);

                     ok = client->requestTerminate( victim, options );
                     TLOG("%s::requestTerminate(%s, ok = %d)\n",
                             client->getName(), victim->getName(), ok);
                     ok = client->requestTerminate( victim, options );
                     TLOG("%s::requestTerminate(%s, ok = %d)\n",
                             client->getName(), victim->getName(), ok);

+
+                   uint64_t regID1 = client->getRegistryEntryID();
+                   uint64_t regID2 = victim->getRegistryEntryID();
+                   IOServiceTrace(
+                       (ok ? IOSERVICE_TERMINATE_REQUEST_OK
+                          : IOSERVICE_TERMINATE_REQUEST_FAIL),
+                       (uintptr_t) regID1, 
+                       (uintptr_t) (regID1 >> 32),
+                       (uintptr_t) regID2, 
+                       (uintptr_t) (regID2 >> 32));
+

                     if( ok)
                         makeInactive->setObject( client );
                 }
                     if( ok)
                         makeInactive->setObject( client );
                 }


@@ -1592,10 +1760,10 @@ bool IOService::terminatePhase1( IOOptionBits options = 0 )
     return( true );
 }
 
     return( true );
 }
 

-void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
+void IOService::scheduleTerminatePhase2( IOOptionBits options )

 {
     AbsoluteTime       deadline;
 {
     AbsoluteTime       deadline;

-    int                        waitResult;
+    int                        waitResult = THREAD_AWAKENED;

     bool               wait, haveDeadline = false;
 
     options |= kIOServiceRequired;
     bool               wait, haveDeadline = false;
 
     options |= kIOServiceRequired;


@@ -1620,7 +1788,8 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
         gIOTerminateWork++;
 
         do {
         gIOTerminateWork++;
 
         do {

-            terminateWorker( options );
+           while( gIOTerminateWork )
+               terminateWorker( options );

             wait = (0 != (__state[1] & kIOServiceBusyStateMask));
             if( wait) {
                 // wait for the victim to go non-busy
             wait = (0 != (__state[1] & kIOServiceBusyStateMask));
             if( wait) {
                 // wait for the victim to go non-busy


@@ -1631,21 +1800,24 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
                 waitResult = IOLockSleepDeadline( gJobsLock, &gIOTerminateWork,
                                                   deadline, THREAD_UNINT );
                 if( waitResult == THREAD_TIMED_OUT) {
                 waitResult = IOLockSleepDeadline( gJobsLock, &gIOTerminateWork,
                                                   deadline, THREAD_UNINT );
                 if( waitResult == THREAD_TIMED_OUT) {

-                    TLOG("%s::terminate(kIOServiceSynchronous) timeout", getName());
-                } else
-                    thread_cancel_timer();
+                    IOLog("%s::terminate(kIOServiceSynchronous) timeout\n", getName());
+               }

             }
             }

-        } while( wait && (waitResult != THREAD_TIMED_OUT));
+        } while(gIOTerminateWork || (wait && (waitResult != THREAD_TIMED_OUT)));

 
 

-        gIOTerminateThread = 0;
-        IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
+       gIOTerminateThread = 0;
+       IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);

 
     } else {
         // ! kIOServiceSynchronous
 
         gIOTerminatePhase2List->setObject( this );
 
     } else {
         // ! kIOServiceSynchronous
 
         gIOTerminatePhase2List->setObject( this );

-        if( 0 == gIOTerminateWork++)
-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) options );
+        if( 0 == gIOTerminateWork++) {
+           if( !gIOTerminateThread)
+               kernel_thread_start(&terminateThread, (void *) options, &gIOTerminateThread);
+           else
+               IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
+       }

     }
 
     IOLockUnlock( gJobsLock );
     }
 
     IOLockUnlock( gJobsLock );


@@ -1653,12 +1825,14 @@ void IOService::scheduleTerminatePhase2( IOOptionBits options = 0 )
     release();
 }
 
     release();
 }
 

-void IOService::terminateThread( void * arg )
+void IOService::terminateThread( void * arg, wait_result_t waitResult )

 {
     IOLockLock( gJobsLock );
 
 {
     IOLockLock( gJobsLock );
 

-    terminateWorker( (IOOptionBits) arg );
+    while (gIOTerminateWork)
+       terminateWorker( (uintptr_t) arg );

 
 

+    thread_deallocate(gIOTerminateThread);

     gIOTerminateThread = 0;
     IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
 
     gIOTerminateThread = 0;
     IOLockWakeup( gJobsLock, (event_t) &gIOTerminateThread, /* one-thread */ false);
 


@@ -1669,13 +1843,22 @@ void IOService::scheduleStop( IOService * provider )
 {
     TLOG("%s::scheduleStop(%s)\n", getName(), provider->getName());
 
 {
     TLOG("%s::scheduleStop(%s)\n", getName(), provider->getName());
 

+    uint64_t regID1 = getRegistryEntryID();
+    uint64_t regID2 = provider->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_SCHEDULE_STOP,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) regID2, 
+       (uintptr_t) (regID2 >> 32));
+

     IOLockLock( gJobsLock );
     gIOStopList->tailQ( this );
     gIOStopProviderList->tailQ( provider );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)
     IOLockLock( gJobsLock );
     gIOStopList->tailQ( this );
     gIOStopProviderList->tailQ( provider );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)

-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) 0 );
+           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);

         else
             IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }
         else
             IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }


@@ -1687,12 +1870,19 @@ void IOService::scheduleFinalize( void )
 {
     TLOG("%s::scheduleFinalize\n", getName());
 
 {
     TLOG("%s::scheduleFinalize\n", getName());
 

+    uint64_t regID1 = getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_SCHEDULE_FINALIZE,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       0, 0);
+

     IOLockLock( gJobsLock );
     gIOFinalizeList->tailQ( this );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)
     IOLockLock( gJobsLock );
     gIOFinalizeList->tailQ( this );
 
     if( 0 == gIOTerminateWork++) {
         if( !gIOTerminateThread)

-            gIOTerminateThread = IOCreateThread( &terminateThread, (void *) 0 );
+           kernel_thread_start(&terminateThread, (void *) 0, &gIOTerminateThread);

         else
             IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }
         else
             IOLockWakeup(gJobsLock, (event_t) &gIOTerminateWork, /* one-thread */ false );
     }


@@ -1736,8 +1926,18 @@ void IOService::actionWillTerminate( IOService * victim, IOOptionBits options,
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {

-            TLOG("%s::willTerminate(%s, %08lx)\n",
-                    client->getName(), victim->getName(), options);
+            TLOG("%s::willTerminate(%s, %08llx)\n",
+                    client->getName(), victim->getName(), (long long)options);
+
+           uint64_t regID1 = client->getRegistryEntryID();
+           uint64_t regID2 = victim->getRegistryEntryID();
+           IOServiceTrace(
+               IOSERVICE_TERMINATE_WILL,
+               (uintptr_t) regID1, 
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) regID2, 
+               (uintptr_t) (regID2 >> 32));
+

             ok = client->willTerminate( victim, options );
             doPhase2List->tailQ( client );
         }
             ok = client->willTerminate( victim, options );
             doPhase2List->tailQ( client );
         }


@@ -1756,9 +1956,20 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options )
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {
     iter = victim->getClientIterator();
     if( iter) {
         while( (client = (IOService *) iter->getNextObject())) {

-            TLOG("%s::didTerminate(%s, %08lx)\n",
-                    client->getName(), victim->getName(), options);
+            TLOG("%s::didTerminate(%s, %08llx)\n",
+                    client->getName(), victim->getName(), (long long)options);

             client->didTerminate( victim, options, &defer );
             client->didTerminate( victim, options, &defer );

+
+           uint64_t regID1 = client->getRegistryEntryID();
+           uint64_t regID2 = victim->getRegistryEntryID();
+           IOServiceTrace(
+               (defer ? IOSERVICE_TERMINATE_DID_DEFER
+                      : IOSERVICE_TERMINATE_DID),
+               (uintptr_t) regID1, 
+               (uintptr_t) (regID1 >> 32),
+               (uintptr_t) regID2, 
+               (uintptr_t) (regID2 >> 32));
+

             TLOG("%s::didTerminate(%s, defer %d)\n",
                     client->getName(), victim->getName(), defer);
         }
             TLOG("%s::didTerminate(%s, defer %d)\n",
                     client->getName(), victim->getName(), defer);
         }


@@ -1768,13 +1979,31 @@ void IOService::actionDidTerminate( IOService * victim, IOOptionBits options )
 
 void IOService::actionFinalize( IOService * victim, IOOptionBits options )
 {
 
 void IOService::actionFinalize( IOService * victim, IOOptionBits options )
 {

-    TLOG("%s::finalize(%08lx)\n", victim->getName(), options);
+    TLOG("%s::finalize(%08llx)\n", victim->getName(), (long long)options);
+
+    uint64_t regID1 = victim->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_FINALIZE,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       0, 0);
+

     victim->finalize( options );
 }
 
 void IOService::actionStop( IOService * provider, IOService * client )
 {
     TLOG("%s::stop(%s)\n", client->getName(), provider->getName());
     victim->finalize( options );
 }
 
 void IOService::actionStop( IOService * provider, IOService * client )
 {
     TLOG("%s::stop(%s)\n", client->getName(), provider->getName());

+
+    uint64_t regID1 = provider->getRegistryEntryID();
+    uint64_t regID2 = client->getRegistryEntryID();
+    IOServiceTrace(
+       IOSERVICE_TERMINATE_STOP,
+       (uintptr_t) regID1, 
+       (uintptr_t) (regID1 >> 32),
+       (uintptr_t) regID2, 
+       (uintptr_t) (regID2 >> 32));
+

     client->stop( provider );
     if( provider->isOpen( client ))
         provider->close( client );
     client->stop( provider );
     if( provider->isOpen( client ))
         provider->close( client );


@@ -1884,10 +2113,30 @@ void IOService::terminateWorker( IOOptionBits options )
                 if( !provider->isChild( client, gIOServicePlane )) {
                     // may be multiply queued - nop it
                     TLOG("%s::nop stop(%s)\n", client->getName(), provider->getName());
                 if( !provider->isChild( client, gIOServicePlane )) {
                     // may be multiply queued - nop it
                     TLOG("%s::nop stop(%s)\n", client->getName(), provider->getName());

+
+                   uint64_t regID1 = provider->getRegistryEntryID();
+                   uint64_t regID2 = client->getRegistryEntryID();
+                   IOServiceTrace(
+                       IOSERVICE_TERMINATE_STOP_NOP,
+                       (uintptr_t) regID1, 
+                       (uintptr_t) (regID1 >> 32),
+                       (uintptr_t) regID2, 
+                       (uintptr_t) (regID2 >> 32));
+

                 } else {
                     // not ready for stop if it has clients, skip it
                     if( (client->__state[1] & kIOServiceTermPhase3State) && client->getClient()) {
                         TLOG("%s::defer stop(%s)\n", client->getName(), provider->getName());
                 } else {
                     // not ready for stop if it has clients, skip it
                     if( (client->__state[1] & kIOServiceTermPhase3State) && client->getClient()) {
                         TLOG("%s::defer stop(%s)\n", client->getName(), provider->getName());

+
+                       uint64_t regID1 = provider->getRegistryEntryID();
+                       uint64_t regID2 = client->getRegistryEntryID();
+                       IOServiceTrace(
+                           IOSERVICE_TERMINATE_STOP_DEFER,
+                           (uintptr_t) regID1, 
+                           (uintptr_t) (regID1 >> 32),
+                           (uintptr_t) regID2, 
+                           (uintptr_t) (regID2 >> 32));
+

                         idx++;
                         continue;
                     }
                         idx++;
                         continue;
                     }


@@ -1916,6 +2165,9 @@ void IOService::terminateWorker( IOOptionBits options )
 
         if( !moreToDo) {
             TLOG("iokit terminate done, %d stops remain\n", gIOStopList->getCount());
 
         if( !moreToDo) {
             TLOG("iokit terminate done, %d stops remain\n", gIOStopList->getCount());

+           IOServiceTrace(
+               IOSERVICE_TERMINATE_DONE,
+               (uintptr_t) gIOStopList->getCount(), 0, 0, 0);

         }
 
     } while( moreToDo );
         }
 
     } while( moreToDo );


@@ -1962,8 +2214,8 @@ bool IOService::finalize( IOOptionBits options )
     return( true );
 }
 
     return( true );
 }
 

-#undef tailQ(o)
-#undef headQ(o)
+#undef tailQ
+#undef headQ

 
 /*
  * Terminate
 
 /*
  * Terminate


@@ -1987,7 +2239,7 @@ bool IOService::terminateClient( IOService * client, IOOptionBits options )
     return( ok );
 }
 
     return( ok );
 }
 

-bool IOService::terminate( IOOptionBits options = 0 )
+bool IOService::terminate( IOOptionBits options )

 {
     options |= kIOServiceTerminate;
 
 {
     options |= kIOServiceTerminate;
 


@@ -2017,8 +2269,8 @@ static void serviceOpenMessageApplier( OSObject * object, void * ctx )
 }
 
 bool IOService::open(  IOService *     forClient,
 }
 
 bool IOService::open(  IOService *     forClient,

-                        IOOptionBits   options = 0,
-                        void *         arg = 0 )
+                        IOOptionBits   options,
+                        void *         arg )

 {
     bool                       ok;
     ServiceOpenMessageContext  context;
 {
     bool                       ok;
     ServiceOpenMessageContext  context;


@@ -2044,7 +2296,7 @@ bool IOService::open(     IOService *     forClient,
 }
 
 void IOService::close(         IOService *     forClient,
 }
 
 void IOService::close(         IOService *     forClient,

-                        IOOptionBits   options = 0 )
+                        IOOptionBits   options )

 {
     bool               wasClosed;
     bool               last = false;
 {
     bool               wasClosed;
     bool               last = false;


@@ -2076,7 +2328,7 @@ void IOService::close(    IOService *     forClient,
     }
 }
 
     }
 }
 

-bool IOService::isOpen( const IOService * forClient = 0 ) const
+bool IOService::isOpen( const IOService * forClient ) const

 {
     IOService *        self = (IOService *) this;
     bool ok;
 {
     IOService *        self = (IOService *) this;
     bool ok;


@@ -2193,7 +2445,7 @@ SInt32 IOServiceOrdering( const OSMetaClassBase * inObj1, const OSMetaClassBase
     return ( val1 - val2 );
 }
 
     return ( val1 - val2 );
 }
 

-IOService * IOService::getClientWithCategory( const OSSymbol * category )
+IOService * IOService::copyClientWithCategory( const OSSymbol * category )

 {
     IOService *                service = 0;
     OSIterator *       iter;
 {
     IOService *                service = 0;
     OSIterator *       iter;


@@ -2207,13 +2459,25 @@ IOService * IOService::getClientWithCategory( const OSSymbol * category )
             nextCat = (const OSSymbol *) OSDynamicCast( OSSymbol,
                        service->getProperty( gIOMatchCategoryKey ));
            if( category == nextCat)
             nextCat = (const OSSymbol *) OSDynamicCast( OSSymbol,
                        service->getProperty( gIOMatchCategoryKey ));
            if( category == nextCat)

+           {
+               service->retain();

                break;
                break;

+           }

        }
        iter->release();
     }
     return( service );
 }
 
        }
        iter->release();
     }
     return( service );
 }
 

+IOService * IOService::getClientWithCategory( const OSSymbol * category )
+{
+    IOService *
+    service = copyClientWithCategory(category);
+    if (service)
+       service->release();
+    return (service);
+}
+

 bool IOService::invokeNotifer( _IOServiceNotifier * notify )
 {
     _IOServiceNotifierInvocation invocation;
 bool IOService::invokeNotifer( _IOServiceNotifier * notify )
 {
     _IOServiceNotifierInvocation invocation;


@@ -2233,7 +2497,7 @@ bool IOService::invokeNotifer( _IOServiceNotifier * notify )
 
     if( willNotify) {
 
 
     if( willNotify) {
 

-        ret = (*notify->handler)( notify->target, notify->ref, this );
+       ret = (*notify->handler)(notify->target, notify->ref, this, notify);

 
         LOCKWRITENOTIFY();
         queue_remove( &notify->handlerInvocations, &invocation,
 
         LOCKWRITENOTIFY();
         queue_remove( &notify->handlerInvocations, &invocation,


@@ -2271,9 +2535,15 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     OSObject           *       nextMatch = 0;
     bool                       started;
     bool                       needReloc = false;
     OSObject           *       nextMatch = 0;
     bool                       started;
     bool                       needReloc = false;

+#if CONFIG_MACF_KEXT
+    OSBoolean          *       isSandbox = 0;
+    bool                       useSandbox = false;
+#endif

 #if IOMATCHDEBUG
     SInt64                     debugFlags;
 #endif
 #if IOMATCHDEBUG
     SInt64                     debugFlags;
 #endif

+    IOService * client = NULL;
+

 
     assert( matches );
     while( !needReloc && (nextMatch = matches->getFirstObject())) {
 
     assert( matches );
     while( !needReloc && (nextMatch = matches->getFirstObject())) {


@@ -2307,8 +2577,8 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                        match->getObject( gIOMatchCategoryKey ));
            if( 0 == category)
                category = gIODefaultMatchCategoryKey;
                        match->getObject( gIOMatchCategoryKey ));
            if( 0 == category)
                category = gIODefaultMatchCategoryKey;

-
-           if( getClientWithCategory( category )) {
+           
+           if( (client = copyClientWithCategory(category)) ) {

 #if IOMATCHDEBUG
                if( debugFlags & kIOLogMatch)
                    LOG("%s: match category %s exists\n", getName(),
 #if IOMATCHDEBUG
                if( debugFlags & kIOLogMatch)
                    LOG("%s: match category %s exists\n", getName(),


@@ -2316,6 +2586,10 @@ void IOService::probeCandidates( OSOrderedSet * matches )
 #endif
                 nextMatch->release();
                 nextMatch = 0;
 #endif
                 nextMatch->release();
                 nextMatch = 0;

+
+               client->release();
+               client = NULL;
+

                 continue;
            }
 
                 continue;
            }
 


@@ -2379,6 +2653,8 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                 if( !symbol)
                     continue;
     
                 if( !symbol)
                     continue;
     

+                //IOLog("%s alloc (symbol %p props %p)\n", symbol->getCStringNoCopy(), symbol, props);
+

                 // alloc the driver instance
                 inst = (IOService *) OSMetaClass::allocClassWithName( symbol);
     
                 // alloc the driver instance
                 inst = (IOService *) OSMetaClass::allocClassWithName( symbol);
     


@@ -2405,7 +2681,10 @@ void IOService::probeCandidates( OSOrderedSet * matches )
                 if( 0 == category)
                     category = gIODefaultMatchCategoryKey;
                 inst->setProperty( gIOMatchCategoryKey, (OSObject *) category );
                 if( 0 == category)
                     category = gIODefaultMatchCategoryKey;
                 inst->setProperty( gIOMatchCategoryKey, (OSObject *) category );

-    
+#if CONFIG_MACF_KEXT
+               isSandbox = OSDynamicCast(OSBoolean,
+                            props->getObject("IOKitForceMatch"));
+#endif

                 // attach driver instance
                 if( !(inst->attach( this )))
                         continue;
                 // attach driver instance
                 if( !(inst->attach( this )))
                         continue;


@@ -2422,6 +2701,21 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     
                 newInst = inst->probe( this, &score );
                 inst->detach( this );
     
                 newInst = inst->probe( this, &score );
                 inst->detach( this );

+#if CONFIG_MACF_KEXT
+               /*
+                * If this is the Sandbox driver and it matched, this is a
+                * disallowed device; toss any drivers that were already
+                * matched.
+                */
+               if (isSandbox && isSandbox->isTrue() && newInst != 0) {
+                   if (startDict != 0) {
+                       startDict->flushCollection();
+                       startDict->release();
+                       startDict = 0;
+                   }
+                   useSandbox = true;
+               }
+#endif

                 if( 0 == newInst) {
 #if IOMATCHDEBUG
                     if( debugFlags & kIOLogProbe)
                 if( 0 == newInst) {
 #if IOMATCHDEBUG
                     if( debugFlags & kIOLogProbe)


@@ -2460,6 +2754,13 @@ void IOService::probeCandidates( OSOrderedSet * matches )
             props->release();
             if( inst)
                 inst->release();
             props->release();
             if( inst)
                 inst->release();

+#if CONFIG_MACF_KEXT
+           /*
+            * If we're forcing the sandbox, drop out of the loop.
+            */
+           if (isSandbox && isSandbox->isTrue() && useSandbox)
+                   break;
+#endif

         }
         familyMatches->release();
         familyMatches = 0;
         }
         familyMatches->release();
         familyMatches = 0;


@@ -2507,16 +2808,35 @@ void IOService::probeCandidates( OSOrderedSet * matches )
     }
 
 
     }
 
 

-    // adjust the busy count by -1 if matching is stalled for a module,
-    // or +1 if a previously stalled matching is complete.
+    // adjust the busy count by +1 if matching is stalled for a module,
+    // or -1 if a previously stalled matching is complete.

     lockForArbitration();
     SInt32 adjBusy = 0;
     lockForArbitration();
     SInt32 adjBusy = 0;

+    uint64_t regID = getRegistryEntryID();
+

     if( needReloc) {
         adjBusy = (__state[1] & kIOServiceModuleStallState) ? 0 : 1;
     if( needReloc) {
         adjBusy = (__state[1] & kIOServiceModuleStallState) ? 0 : 1;

-        if( adjBusy)
+        if( adjBusy) {
+
+           IOServiceTrace(
+               IOSERVICE_MODULESTALL,
+               (uintptr_t) regID, 
+               (uintptr_t) (regID >> 32),
+               (uintptr_t) this,
+               0);
+

             __state[1] |= kIOServiceModuleStallState;
             __state[1] |= kIOServiceModuleStallState;

+       }

 
     } else if( __state[1] & kIOServiceModuleStallState) {
 
     } else if( __state[1] & kIOServiceModuleStallState) {

+
+           IOServiceTrace(
+           IOSERVICE_MODULEUNSTALL,
+           (uintptr_t) regID, 
+           (uintptr_t) (regID >> 32),
+           (uintptr_t) this,
+           0);
+

         __state[1] &= ~kIOServiceModuleStallState;
         adjBusy = -1;
     }
         __state[1] &= ~kIOServiceModuleStallState;
         adjBusy = -1;
     }


@@ -2539,26 +2859,44 @@ bool IOService::startCandidate( IOService * service )
 
     ok = service->attach( this );
 
 
     ok = service->attach( this );
 

-    if( ok) {
-        // stall for any nub resources
-        checkResources();
-        // stall for any driver resources
-        service->checkResources();
+    if( ok)
+    {
+       if (this != gIOResources)
+       {
+           // stall for any nub resources
+           checkResources();
+           // stall for any driver resources
+           service->checkResources();
+       }
+       
+       AbsoluteTime startTime;
+       AbsoluteTime endTime;
+       UInt64       nano;

 
 

+       if (kIOLogStart & gIOKitDebug)
+           clock_get_uptime(&startTime);

 
 

-        ok = service->start( this );
+        ok = service->start(this);
+
+       if (kIOLogStart & gIOKitDebug)
+       {
+           clock_get_uptime(&endTime);
+    
+           if (CMP_ABSOLUTETIME(&endTime, &startTime) > 0)
+           {
+               SUB_ABSOLUTETIME(&endTime, &startTime);
+               absolutetime_to_nanoseconds(endTime, &nano);
+               if (nano > 500000000ULL)
+                   IOLog("%s::start took %ld ms\n", service->getName(), (long)(UInt32)(nano / 1000000ULL));
+           }
+       }

         if( !ok)
             service->detach( this );
     }
     return( ok );
 }
 
         if( !ok)
             service->detach( this );
     }
     return( ok );
 }
 

-IOService * IOService::resources( void )
-{
-    return( gIOResources );
-}
-
-void IOService::publishResource( const char * key, OSObject * value = 0 )
+void IOService::publishResource( const char * key, OSObject * value )

 {
     const OSSymbol *   sym;
 
 {
     const OSSymbol *   sym;
 


@@ -2568,35 +2906,38 @@ void IOService::publishResource( const char * key, OSObject * value = 0 )
     }
 }
 
     }
 }
 

-void IOService::publishResource( const OSSymbol * key, OSObject * value = 0 )
+void IOService::publishResource( const OSSymbol * key, OSObject * value )

 {
     if( 0 == value)
        value = (OSObject *) gIOServiceKey;
 
     gIOResources->setProperty( key, value);
 
 {
     if( 0 == value)
        value = (OSObject *) gIOServiceKey;
 
     gIOResources->setProperty( key, value);
 

+    if( IORecursiveLockHaveLock( gNotificationLock))
+       return;
+

     gIOResourceGenerationCount++;
     gIOResources->registerService();
 }
 
 bool IOService::addNeededResource( const char * key )
 {
     gIOResourceGenerationCount++;
     gIOResources->registerService();
 }
 
 bool IOService::addNeededResource( const char * key )
 {

-    OSObject * resources;
+    OSObject * resourcesProp;

     OSSet *    set;
     OSString * newKey;
     bool ret;
 
     OSSet *    set;
     OSString * newKey;
     bool ret;
 

-    resources = getProperty( gIOResourceMatchKey );
+    resourcesProp = getProperty( gIOResourceMatchKey );

 
     newKey = OSString::withCString( key );
 
     newKey = OSString::withCString( key );

-    if( (0 == resources) || (0 == newKey))
+    if( (0 == resourcesProp) || (0 == newKey))

        return( false);
 
        return( false);
 

-    set = OSDynamicCast( OSSet, resources );
+    set = OSDynamicCast( OSSet, resourcesProp );

     if( !set) {
        set = OSSet::withCapacity( 1 );
        if( set)
     if( !set) {
        set = OSSet::withCapacity( 1 );
        if( set)

-            set->setObject( resources );
+            set->setObject( resourcesProp );

     }
     else
         set->retain();
     }
     else
         set->retain();


@@ -2631,44 +2972,44 @@ bool IOService::checkResource( OSObject * matching )
     }
 
     if( gIOKitDebug & kIOLogConfig)
     }
 
     if( gIOKitDebug & kIOLogConfig)

-        LOG("config(%x): stalling %s\n", (int) IOThreadSelf(), getName());
+        LOG("config(%p): stalling %s\n", IOThreadSelf(), getName());

 
     waitForService( table );
 
     if( gIOKitDebug & kIOLogConfig)
 
     waitForService( table );
 
     if( gIOKitDebug & kIOLogConfig)

-        LOG("config(%x): waking\n", (int) IOThreadSelf() );
+        LOG("config(%p): waking\n", IOThreadSelf() );

 
     return( true );
 }
 
 bool IOService::checkResources( void )
 {
 
     return( true );
 }
 
 bool IOService::checkResources( void )
 {

-    OSObject *                 resources;
+    OSObject *                 resourcesProp;

     OSSet *            set;
     OSIterator *       iter;
     bool               ok;
 
     OSSet *            set;
     OSIterator *       iter;
     bool               ok;
 

-    resources = getProperty( gIOResourceMatchKey );
-    if( 0 == resources)
+    resourcesProp = getProperty( gIOResourceMatchKey );
+    if( 0 == resourcesProp)

         return( true );
 
         return( true );
 

-    if( (set = OSDynamicCast( OSSet, resources ))) {
+    if( (set = OSDynamicCast( OSSet, resourcesProp ))) {

 
        iter = OSCollectionIterator::withCollection( set );
        ok = (0 != iter);
 
        iter = OSCollectionIterator::withCollection( set );
        ok = (0 != iter);

-        while( ok && (resources = iter->getNextObject()) )
-            ok = checkResource( resources );
+        while( ok && (resourcesProp = iter->getNextObject()) )
+            ok = checkResource( resourcesProp );

        if( iter)
            iter->release();
 
     } else
        if( iter)
            iter->release();
 
     } else

-       ok = checkResource( resources );
+       ok = checkResource( resourcesProp );

 
     return( ok );
 }
 
 
 
     return( ok );
 }
 
 

-_IOConfigThread * _IOConfigThread::configThread( void )
+void _IOConfigThread::configThread( void )

 {
     _IOConfigThread *  inst;
 
 {
     _IOConfigThread *  inst;
 


@@ -2677,22 +3018,23 @@ _IOConfigThread * _IOConfigThread::configThread( void )
            continue;
        if( !inst->init())
            continue;
            continue;
        if( !inst->init())
            continue;

-       if( !(inst->thread = IOCreateThread
-                ( (IOThreadFunc) &_IOConfigThread::main, inst )))
+       thread_t unused;
+       if (KERN_SUCCESS != kernel_thread_start(&_IOConfigThread::main, inst, &unused))

            continue;
 
            continue;
 

-       return( inst );
+       return;

 
     } while( false);
 
     if( inst)
        inst->release();
 
 
     } while( false);
 
     if( inst)
        inst->release();
 

-    return( 0 );
+    return;

 }
 
 void _IOConfigThread::free( void )
 {
 }
 
 void _IOConfigThread::free( void )
 {

+    thread_deallocate(current_thread());

     OSObject::free();
 }
 
     OSObject::free();
 }
 


@@ -2790,11 +3132,13 @@ UInt32 IOService::_adjustBusy( SInt32 delta )
         if( next != this)
             next->lockForArbitration();
         count = next->__state[1] & kIOServiceBusyStateMask;
         if( next != this)
             next->lockForArbitration();
         count = next->__state[1] & kIOServiceBusyStateMask;

-        assert( count < kIOServiceBusyMax);

         wasQuiet = (0 == count);
         wasQuiet = (0 == count);

-        assert( (!wasQuiet) || (delta > 0));
-        next->__state[1] += delta;
-        nowQuiet = (0 == (next->__state[1] & kIOServiceBusyStateMask));
+       if (((delta < 0) && wasQuiet) || ((delta > 0) && (kIOServiceBusyMax == count)))
+           OSReportWithBacktrace("%s: bad busy count (%d,%d)\n", next->getName(), count, delta);
+       else
+           count += delta;
+       next->__state[1] = (next->__state[1] & ~kIOServiceBusyStateMask) | count;
+        nowQuiet = (0 == count);

        needWake = (0 != (kIOServiceBusyWaiterState & next->__state[1]));
 
         if( needWake) {
        needWake = (0 != (kIOServiceBusyWaiterState & next->__state[1]));
 
         if( needWake) {


@@ -2807,24 +3151,39 @@ UInt32 IOService::_adjustBusy( SInt32 delta )
             next->unlockForArbitration();
 
         if( (wasQuiet || nowQuiet) ) {
             next->unlockForArbitration();
 
         if( (wasQuiet || nowQuiet) ) {

-            OSArray *          array;
-            unsigned int       index;
-            OSObject *         interested;
-
-            array = OSDynamicCast( OSArray, next->getProperty( gIOBusyInterest ));
-            if( array) {
-                LOCKREADNOTIFY();
-                for( index = 0;
-                     (interested = array->getObject( index ));
-                     index++) {
-                    next->messageClient(kIOMessageServiceBusyStateChange,
-                                     interested, (void *) wasQuiet /* busy now */);
-                }
-                UNLOCKNOTIFY();
-            }
+           uint64_t regID = next->getRegistryEntryID();
+
+               IOServiceTrace(
+               ((wasQuiet/*nowBusy*/) ? IOSERVICE_BUSY : IOSERVICE_NONBUSY),
+               (uintptr_t) regID, 
+               (uintptr_t) (regID >> 32),
+               (uintptr_t) next,
+               0);
+
+           if (wasQuiet)
+           {
+               next->__timeBusy = mach_absolute_time();
+           }
+           else
+           {
+               next->__accumBusy += mach_absolute_time() - next->__timeBusy;
+               next->__timeBusy = 0;
+           }
+
+           MessageClientsContext context;

 
 

+           context.service  = next;
+           context.type     = kIOMessageServiceBusyStateChange;
+           context.argument = (void *) wasQuiet;       /*nowBusy*/
+           context.argSize  = 0;
+
+           applyToInterestNotifiers( next, gIOBusyInterest, 
+                                    &messageClientsApplier, &context );
+
+#if !NO_KEXTD

             if( nowQuiet && (next == gIOServiceRoot))
             if( nowQuiet && (next == gIOServiceRoot))

-                OSMetaClass::considerUnloads();
+                OSKext::considerUnloads();
+#endif

         }
 
         delta = nowQuiet ? -1 : +1;
         }
 
         delta = nowQuiet ? -1 : +1;


@@ -2841,13 +3200,40 @@ void IOService::adjustBusy( SInt32 delta )
     unlockForArbitration();
 }
 
     unlockForArbitration();
 }
 

+uint64_t IOService::getAccumulatedBusyTime( void )
+{
+    uint64_t accumBusy = __accumBusy;
+    uint64_t timeBusy = __timeBusy;
+    uint64_t nano;
+
+    do
+    {
+       accumBusy = __accumBusy;
+       timeBusy  = __timeBusy;
+       if (timeBusy)
+           accumBusy += mach_absolute_time() - timeBusy;
+    }
+    while (timeBusy != __timeBusy);
+
+    absolutetime_to_nanoseconds(*(AbsoluteTime *)&accumBusy, &nano);
+
+    return (nano);
+}
+

 UInt32 IOService::getBusyState( void )
 {
     return( __state[1] & kIOServiceBusyStateMask );
 }
 
 IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
 UInt32 IOService::getBusyState( void )
 {
     return( __state[1] & kIOServiceBusyStateMask );
 }
 
 IOReturn IOService::waitForState( UInt32 mask, UInt32 value,

-                                mach_timespec_t * timeout = 0 )
+                                 mach_timespec_t * timeout )
+{
+    panic("waitForState");
+    return (kIOReturnUnsupported);
+}
+
+IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
+                                  uint64_t timeout )

 {
     bool            wait;
     int             waitResult = THREAD_AWAKENED;
 {
     bool            wait;
     int             waitResult = THREAD_AWAKENED;


@@ -2861,29 +3247,22 @@ IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
         if( wait) {
             __state[1] |= kIOServiceBusyWaiterState;
             unlockForArbitration();
         if( wait) {
             __state[1] |= kIOServiceBusyWaiterState;
             unlockForArbitration();

-            assert_wait( (event_t) this, THREAD_UNINT );
-            if( timeout ) {
+            if( timeout != UINT64_MAX ) {

                 if( computeDeadline ) {
                     AbsoluteTime  nsinterval;
                 if( computeDeadline ) {
                     AbsoluteTime  nsinterval;

-                    clock_interval_to_absolutetime_interval(
-                          timeout->tv_sec, kSecondScale, &abstime );
-                    clock_interval_to_absolutetime_interval(
-                          timeout->tv_nsec, kNanosecondScale, &nsinterval );
-                    ADD_ABSOLUTETIME( &abstime, &nsinterval );
-                    clock_absolutetime_interval_to_deadline(
-                          abstime, &abstime );
+                    nanoseconds_to_absolutetime(timeout, &nsinterval );
+                    clock_absolutetime_interval_to_deadline(nsinterval, &abstime);

                     computeDeadline = false;
                 }
                     computeDeadline = false;
                 }

-                thread_set_timer_deadline( abstime );
+                assert_wait_deadline((event_t)this, THREAD_UNINT, __OSAbsoluteTime(abstime));

             }
             }

+            else
+                assert_wait((event_t)this, THREAD_UNINT );

         } else
             unlockForArbitration();
         IOLockUnlock( gIOServiceBusyLock );
         } else
             unlockForArbitration();
         IOLockUnlock( gIOServiceBusyLock );

-        if( wait) {
+        if( wait)

             waitResult = thread_block(THREAD_CONTINUE_NULL);
             waitResult = thread_block(THREAD_CONTINUE_NULL);

-            if( timeout && (waitResult != THREAD_TIMED_OUT))
-               thread_cancel_timer();
-        }

 
     } while( wait && (waitResult != THREAD_TIMED_OUT));
 
 
     } while( wait && (waitResult != THREAD_TIMED_OUT));
 


@@ -2893,11 +3272,27 @@ IOReturn IOService::waitForState( UInt32 mask, UInt32 value,
         return( kIOReturnSuccess );
 }
 
         return( kIOReturnSuccess );
 }
 

-IOReturn IOService::waitQuiet( mach_timespec_t * timeout = 0 )
+IOReturn IOService::waitQuiet( uint64_t timeout )

 {
     return( waitForState( kIOServiceBusyStateMask, 0, timeout ));
 }
 
 {
     return( waitForState( kIOServiceBusyStateMask, 0, timeout ));
 }
 

+IOReturn IOService::waitQuiet( mach_timespec_t * timeout )
+{
+    uint64_t    timeoutNS;
+
+    if (timeout)
+    {
+       timeoutNS = timeout->tv_sec;
+       timeoutNS *= kSecondScale;
+       timeoutNS += timeout->tv_nsec;
+    }
+    else
+       timeoutNS = UINT64_MAX;
+
+    return( waitForState( kIOServiceBusyStateMask, 0, timeoutNS ));
+}
+

 bool IOService::serializeProperties( OSSerialize * s ) const
 {
 #if 0
 bool IOService::serializeProperties( OSSerialize * s ) const
 {
 #if 0


@@ -2908,11 +3303,21 @@ bool IOService::serializeProperties( OSSerialize * s ) const
 }
 
 
 }
 
 

-void _IOConfigThread::main( _IOConfigThread * self )
+void _IOConfigThread::main(void * arg, wait_result_t result)

 {
 {

-    _IOServiceJob *    job;
-    IOService  *       nub;
-    bool               alive = true;
+    _IOConfigThread * self = (_IOConfigThread *) arg;
+    _IOServiceJob * job;
+    IOService  *   nub;
+    bool           alive = true;
+    kern_return_t   kr;
+    thread_precedence_policy_data_t precedence = { -1 };
+
+    kr = thread_policy_set(current_thread(), 
+                           THREAD_PRECEDENCE_POLICY, 
+                           (thread_policy_t) &precedence, 
+                           THREAD_PRECEDENCE_POLICY_COUNT);
+    if (KERN_SUCCESS != kr)
+       IOLog("thread_policy_set(%d)\n", kr);

 
     do {
 
 
     do {
 


@@ -2936,8 +3341,8 @@ void _IOConfigThread::main( _IOConfigThread * self )
          nub = job->nub;
 
           if( gIOKitDebug & kIOLogConfig)
          nub = job->nub;
 
           if( gIOKitDebug & kIOLogConfig)

-            LOG("config(%x): starting on %s, %d\n",
-                        (int) IOThreadSelf(), job->nub->getName(), job->type);
+            LOG("config(%p): starting on %s, %d\n",
+                        IOThreadSelf(), job->nub->getName(), job->type);

 
          switch( job->type) {
 
 
          switch( job->type) {
 


@@ -2946,8 +3351,8 @@ void _IOConfigThread::main( _IOConfigThread * self )
                break;
 
             default:
                break;
 
             default:

-                LOG("config(%x): strange type (%d)\n",
-                       (int) IOThreadSelf(), job->type );
+                LOG("config(%p): strange type (%d)\n",
+                       IOThreadSelf(), job->type );

                break;
             }
 
                break;
             }
 


@@ -2971,7 +3376,7 @@ void _IOConfigThread::main( _IOConfigThread * self )
     } while( alive );
 
     if( gIOKitDebug & kIOLogConfig)
     } while( alive );
 
     if( gIOKitDebug & kIOLogConfig)

-        LOG("config(%x): terminating\n", (int) IOThreadSelf() );
+        LOG("config(%p): terminating\n", IOThreadSelf() );

 
     self->release();
 }
 
     self->release();
 }


@@ -3046,44 +3451,68 @@ void _IOServiceJob::pingConfig( _IOServiceJob * job )
     semaphore_signal( gJobsSemaphore );
 }
 
     semaphore_signal( gJobsSemaphore );
 }
 

-

 // internal - call with gNotificationLock
 // internal - call with gNotificationLock

-OSObject * IOService::getExistingServices( OSDictionary * matching,
-                IOOptionBits inState, IOOptionBits options = 0 )
+OSObject * IOService::copyExistingServices( OSDictionary * matching,
+                IOOptionBits inState, IOOptionBits options )

 {
     OSObject *         current = 0;
     OSIterator *       iter;
     IOService *                service;
 {
     OSObject *         current = 0;
     OSIterator *       iter;
     IOService *                service;

+    OSObject *         obj;

 
     if( !matching)
        return( 0 );
 
 
     if( !matching)
        return( 0 );
 

-    iter = IORegistryIterator::iterateOver( gIOServicePlane,
-                                       kIORegistryIterateRecursively );
-    if( iter) {
-        do {
-            iter->reset();
-            while( (service = (IOService *) iter->getNextObject())) {
-                if( (inState == (service->__state[0] & inState))
-                && (0 == (service->__state[0] & kIOServiceInactiveState))
-                 &&  service->passiveMatch( matching )) {
-
-                    if( options & kIONotifyOnce) {
-                        current = service;
-                        break;
-                    }
-                    if( current)
-                        ((OSSet *)current)->setObject( service );
-                    else
-                        current = OSSet::withObjects(
-                                       & (const OSObject *) service, 1, 1 );
-                }
-            }
-        } while( !service && !iter->isValid());
-        iter->release();
+    if(true 
+      && (obj = matching->getObject(gIOProviderClassKey))
+      && gIOResourcesKey
+      && gIOResourcesKey->isEqualTo(obj)
+      && (service = gIOResources))
+    {
+       if( (inState == (service->__state[0] & inState))
+         && (0 == (service->__state[0] & kIOServiceInactiveState))
+         &&  service->passiveMatch( matching ))
+       {
+           if( options & kIONotifyOnce)
+           {
+               service->retain();
+               current = service;
+           }
+           else
+               current = OSSet::withObjects(
+                               (const OSObject **) &service, 1, 1 );
+       }
+    }
+    else
+    {
+       iter = IORegistryIterator::iterateOver( gIOServicePlane,
+                                           kIORegistryIterateRecursively );
+       if( iter) {
+           do {
+               iter->reset();
+               while( (service = (IOService *) iter->getNextObject())) {
+                   if( (inState == (service->__state[0] & inState))
+                   && (0 == (service->__state[0] & kIOServiceInactiveState))
+                   &&  service->passiveMatch( matching )) {
+    
+                       if( options & kIONotifyOnce) {
+                           service->retain();
+                           current = service;
+                           break;
+                       }
+                       if( current)
+                           ((OSSet *)current)->setObject( service );
+                       else
+                           current = OSSet::withObjects(
+                                           (const OSObject **) &service, 1, 1 );
+                   }
+               }
+           } while( !service && !iter->isValid());
+           iter->release();
+       }

     }
 
     }
 

-    if( current && (0 == (options & kIONotifyOnce))) {
+    if( current && (0 == (options & (kIONotifyOnce | kIOServiceExistingSet)))) {

        iter = OSCollectionIterator::withCollection( (OSSet *)current );
        current->release();
        current = iter;
        iter = OSCollectionIterator::withCollection( (OSSet *)current );
        current->release();
        current = iter;


@@ -3100,7 +3529,7 @@ OSIterator * IOService::getMatchingServices( OSDictionary * matching )
     // is a lock even needed?
     LOCKWRITENOTIFY();
 
     // is a lock even needed?
     LOCKWRITENOTIFY();
 

-    iter = (OSIterator *) getExistingServices( matching,
+    iter = (OSIterator *) copyExistingServices( matching,

                                                kIOServiceMatchedState );
     
     UNLOCKNOTIFY();
                                                kIOServiceMatchedState );
     
     UNLOCKNOTIFY();


@@ -3108,12 +3537,24 @@ OSIterator * IOService::getMatchingServices( OSDictionary * matching )
     return( iter );
 }
 
     return( iter );
 }
 

+struct _IOServiceMatchingNotificationHandlerRef
+{
+    IOServiceNotificationHandler handler;
+    void * ref;
+};
+
+static bool _IOServiceMatchingNotificationHandler( void * target, void * refCon,
+                                                  IOService * newService,
+                                                  IONotifier * notifier )
+{
+    return ((*((_IOServiceNotifier *) notifier)->compatHandler)(target, refCon, newService));
+}

 
 // internal - call with gNotificationLock
 IONotifier * IOService::setNotification(
            const OSSymbol * type, OSDictionary * matching,
 
 // internal - call with gNotificationLock
 IONotifier * IOService::setNotification(
            const OSSymbol * type, OSDictionary * matching,

-            IOServiceNotificationHandler handler, void * target, void * ref,
-            SInt32 priority = 0 )
+            IOServiceMatchingNotificationHandler handler, void * target, void * ref,
+            SInt32 priority )

 {
     _IOServiceNotifier * notify = 0;
     OSOrderedSet *     set;
 {
     _IOServiceNotifier * notify = 0;
     OSOrderedSet *     set;


@@ -3128,10 +3569,17 @@ IONotifier * IOService::setNotification(
     }
 
     if( notify) {
     }
 
     if( notify) {

-        notify->matching = matching;
-        notify->handler = handler;
+       notify->handler = handler;

         notify->target = target;
         notify->target = target;

-        notify->ref = ref;
+        notify->matching = matching;
+       matching->retain();
+       if (handler == &_IOServiceMatchingNotificationHandler)
+       {
+           notify->compatHandler = ((_IOServiceMatchingNotificationHandlerRef *)ref)->handler;
+           notify->ref = ((_IOServiceMatchingNotificationHandlerRef *)ref)->ref;
+       }
+       else
+           notify->ref = ref;

         notify->priority = priority;
        notify->state = kIOServiceNotifyEnable;
         queue_init( &notify->handlerInvocations );
         notify->priority = priority;
        notify->state = kIOServiceNotifyEnable;
         queue_init( &notify->handlerInvocations );


@@ -3157,7 +3605,7 @@ IONotifier * IOService::setNotification(
 // internal - call with gNotificationLock
 IONotifier * IOService::doInstallNotification(
                        const OSSymbol * type, OSDictionary * matching,
 // internal - call with gNotificationLock
 IONotifier * IOService::doInstallNotification(
                        const OSSymbol * type, OSDictionary * matching,

-                       IOServiceNotificationHandler handler,
+                       IOServiceMatchingNotificationHandler handler,

                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {
                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {


@@ -3186,7 +3634,7 @@ IONotifier * IOService::doInstallNotification(
     
     if( inState)
         // get the current set
     
     if( inState)
         // get the current set

-        exist = (OSIterator *) getExistingServices( matching, inState );
+        exist = (OSIterator *) copyExistingServices( matching, inState );

     else
        exist = 0;
 
     else
        exist = 0;
 


@@ -3195,14 +3643,35 @@ IONotifier * IOService::doInstallNotification(
     return( notify );
 }
 
     return( notify );
 }
 

+#if !defined(__LP64__)
+IONotifier * IOService::installNotification(const OSSymbol * type, OSDictionary * matching,
+                                       IOServiceNotificationHandler handler,
+                                       void * target, void * refCon,
+                                       SInt32 priority, OSIterator ** existing )
+{
+    IONotifier * result;
+    _IOServiceMatchingNotificationHandlerRef ref;
+    ref.handler = handler;
+    ref.ref     = refCon;
+
+    result = (_IOServiceNotifier *) installNotification( type, matching,
+                        &_IOServiceMatchingNotificationHandler, 
+                       target, &ref, priority, existing );
+    if (result)
+       matching->release();
+
+    return (result);
+}
+#endif /* !defined(__LP64__) */
+

 
 IONotifier * IOService::installNotification(
                        const OSSymbol * type, OSDictionary * matching,
 
 IONotifier * IOService::installNotification(
                        const OSSymbol * type, OSDictionary * matching,

-                       IOServiceNotificationHandler handler,
+                       IOServiceMatchingNotificationHandler handler,

                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {
                        void * target, void * ref,
                        SInt32 priority, OSIterator ** existing )
 {

-    IONotifier *       notify;
+    IONotifier * notify;

 
     LOCKWRITENOTIFY();
 
 
     LOCKWRITENOTIFY();
 


@@ -3217,10 +3686,31 @@ IONotifier * IOService::installNotification(
 IONotifier * IOService::addNotification(
                        const OSSymbol * type, OSDictionary * matching,
                        IOServiceNotificationHandler handler,
 IONotifier * IOService::addNotification(
                        const OSSymbol * type, OSDictionary * matching,
                        IOServiceNotificationHandler handler,

-                       void * target, void * ref = 0,
-                       SInt32 priority = 0 )
+                       void * target, void * refCon,
+                       SInt32 priority )

 {
 {

-    OSIterator *               existing;
+    IONotifier * result;
+    _IOServiceMatchingNotificationHandlerRef ref;
+    
+    ref.handler = handler;
+    ref.ref     = refCon;
+    
+    result = addMatchingNotification(type, matching, &_IOServiceMatchingNotificationHandler,
+                           target, &ref, priority);
+
+    if (result)
+       matching->release();
+
+    return (result);
+}
+
+IONotifier * IOService::addMatchingNotification(
+                       const OSSymbol * type, OSDictionary * matching,
+                       IOServiceMatchingNotificationHandler handler,
+                       void * target, void * ref,
+                       SInt32 priority )
+{
+    OSIterator *               existing = NULL;

     _IOServiceNotifier *       notify;
     IOService *                        next;
 
     _IOServiceNotifier *       notify;
     IOService *                        next;
 


@@ -3245,76 +3735,93 @@ IONotifier * IOService::addNotification(
     return( notify );
 }
 
     return( notify );
 }
 

-struct SyncNotifyVars {
-    semaphore_port_t   waitHere;
-    IOService *                result;
-};
-

 bool IOService::syncNotificationHandler(
                        void * /* target */, void * ref,
 bool IOService::syncNotificationHandler(
                        void * /* target */, void * ref,

-                       IOService * newService )
+                       IOService * newService,
+                       IONotifier * notifier )

 {
 
 {
 

-    // result may get written more than once before the
-    // notification is removed!
-    ((SyncNotifyVars *) ref)->result = newService;
-    semaphore_signal( ((SyncNotifyVars *) ref)->waitHere );
+    LOCKWRITENOTIFY();
+    if (!*((IOService **) ref))
+    {
+       newService->retain();
+       (*(IOService **) ref) = newService;
+       WAKEUPNOTIFY(ref);
+    }
+    UNLOCKNOTIFY();

 
     return( false );
 }
 
 
     return( false );
 }
 

-IOService * IOService::waitForService( OSDictionary * matching,
-                               mach_timespec_t * timeout = 0 )
+IOService * IOService::waitForMatchingService( OSDictionary * matching,
+                                               uint64_t timeout)

 {
     IONotifier *       notify = 0;
     // priority doesn't help us much since we need a thread wakeup
     SInt32             priority = 0;
 {
     IONotifier *       notify = 0;
     // priority doesn't help us much since we need a thread wakeup
     SInt32             priority = 0;

-    SyncNotifyVars     state;
-    kern_return_t      err = kIOReturnBadArgument;
+    IOService *        result;

 
 

-    if( !matching)
+    if (!matching)

         return( 0 );
 
         return( 0 );
 

-    state.waitHere = 0;
-    state.result = 0;
+    result = NULL;

 
     LOCKWRITENOTIFY();
 
     LOCKWRITENOTIFY();

-
-    do {
-
-        state.result = (IOService *) getExistingServices( matching,
+    do
+    {
+        result = (IOService *) copyExistingServices( matching,

                             kIOServiceMatchedState, kIONotifyOnce );
                             kIOServiceMatchedState, kIONotifyOnce );

-       if( state.result)
-           continue;
-
-        err = semaphore_create( kernel_task, &state.waitHere,
-                                    SYNC_POLICY_FIFO, 0 );
-        if( KERN_SUCCESS != err)
-            continue;
-
+       if (result)
+           break;

         notify = IOService::setNotification( gIOMatchedNotification, matching,
                     &IOService::syncNotificationHandler, (void *) 0,
         notify = IOService::setNotification( gIOMatchedNotification, matching,
                     &IOService::syncNotificationHandler, (void *) 0,

-                    (void *) &state, priority );
-
-    } while( false );
-
-    UNLOCKNOTIFY();
-
-     if( notify) {
-        if( timeout)
-            err = semaphore_timedwait( state.waitHere, *timeout );
+                    &result, priority );
+        if (!notify)
+           break;
+        if (UINT64_MAX != timeout)
+       {
+           AbsoluteTime deadline;
+           nanoseconds_to_absolutetime(timeout, &deadline);
+           clock_absolutetime_interval_to_deadline(deadline, &deadline);
+           SLEEPNOTIFYTO(&result, deadline);
+       }

         else
         else

-            err = semaphore_wait( state.waitHere );
+       {
+           SLEEPNOTIFY(&result);
+       }

     }
     }

+    while( false );
+
+    UNLOCKNOTIFY();

 
 

-    if( notify)
+    if (notify)

         notify->remove();      // dequeues
         notify->remove();      // dequeues

+
+    return( result );
+}
+
+IOService * IOService::waitForService( OSDictionary * matching,
+                                       mach_timespec_t * timeout )
+{
+    IOService * result;
+    uint64_t    timeoutNS;
+
+    if (timeout)
+    {
+       timeoutNS = timeout->tv_sec;
+       timeoutNS *= kSecondScale;
+       timeoutNS += timeout->tv_nsec;
+    }

     else
     else

-        matching->release();
-    if( state.waitHere)
-        semaphore_destroy( kernel_task, state.waitHere );
+       timeoutNS = UINT64_MAX;

 
 

-    return( state.result );
+    result = waitForMatchingService(matching, timeoutNS);
+
+    matching->release();
+    if (result)
+       result->release();
+
+    return (result);

 }
 
 void IOService::deliverNotification( const OSSymbol * type,
 }
 
 void IOService::deliverNotification( const OSSymbol * type,


@@ -3374,7 +3881,7 @@ IOOptionBits IOService::getState( void ) const
  */
 
 OSDictionary * IOService::serviceMatching( const OSString * name,
  */
 
 OSDictionary * IOService::serviceMatching( const OSString * name,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );
 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );


@@ -3385,7 +3892,7 @@ OSDictionary * IOService::serviceMatching( const OSString * name,
 }
 
 OSDictionary * IOService::serviceMatching( const char * name,
 }
 
 OSDictionary * IOService::serviceMatching( const char * name,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     const OSString *   str;
 
 {
     const OSString *   str;
 


@@ -3399,7 +3906,7 @@ OSDictionary * IOService::serviceMatching( const char * name,
 }
 
 OSDictionary * IOService::nameMatching( const OSString * name,
 }
 
 OSDictionary * IOService::nameMatching( const OSString * name,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );
 {
     if( !table)
        table = OSDictionary::withCapacity( 2 );


@@ -3410,7 +3917,7 @@ OSDictionary * IOService::nameMatching( const OSString * name,
 }
 
 OSDictionary * IOService::nameMatching( const char * name,
 }
 
 OSDictionary * IOService::nameMatching( const char * name,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     const OSString *   str;
 
 {
     const OSString *   str;
 


@@ -3424,7 +3931,7 @@ OSDictionary * IOService::nameMatching( const char * name,
 }
 
 OSDictionary * IOService::resourceMatching( const OSString * str,
 }
 
 OSDictionary * IOService::resourceMatching( const OSString * str,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     table = serviceMatching( gIOResourcesKey, table );
     if( table)
 {
     table = serviceMatching( gIOResourcesKey, table );
     if( table)


@@ -3434,7 +3941,7 @@ OSDictionary * IOService::resourceMatching( const OSString * str,
 }
 
 OSDictionary * IOService::resourceMatching( const char * name,
 }
 
 OSDictionary * IOService::resourceMatching( const char * name,

-                       OSDictionary * table = 0 )
+                       OSDictionary * table )

 {
     const OSSymbol *   str;
 
 {
     const OSSymbol *   str;
 


@@ -3448,6 +3955,47 @@ OSDictionary * IOService::resourceMatching( const char * name,
     return( table );
 }
 
     return( table );
 }
 

+OSDictionary * IOService::propertyMatching( const OSSymbol * key, const OSObject * value,
+                       OSDictionary * table )
+{
+    OSDictionary * properties;
+
+    properties = OSDictionary::withCapacity( 2 );
+    if( !properties)
+       return( 0 );
+    properties->setObject( key, value );
+
+    if( !table)
+       table = OSDictionary::withCapacity( 2 );
+    if( table)
+        table->setObject( gIOPropertyMatchKey, properties );
+
+    properties->release();
+
+    return( table );
+}
+
+OSDictionary * IOService::registryEntryIDMatching( uint64_t entryID,
+                       OSDictionary * table )
+{
+    OSNumber *     num;
+
+    num = OSNumber::withNumber( entryID, 64 );
+    if( !num)
+       return( 0 );
+
+    if( !table)
+       table = OSDictionary::withCapacity( 2 );
+    if( table)
+        table->setObject( gIORegistryEntryIDKey, num );
+       
+    if (num)
+       num->release();
+
+    return( table );
+}
+
+

 /*
  * _IOServiceNotifier
  */
 /*
  * _IOServiceNotifier
  */


@@ -3550,8 +4098,8 @@ IOService * IOResources::resources( void )
 
 IOWorkLoop * IOResources::getWorkLoop() const
 {
 
 IOWorkLoop * IOResources::getWorkLoop() const
 {

-    // If we are the resource root then bringe over to the
-    // platform to get its workloop
+    // If we are the resource root
+    // then use the platform's workloop

     if (this == (IOResources *) gIOResources)
        return getPlatform()->getWorkLoop();
     else
     if (this == (IOResources *) gIOResources)
        return getPlatform()->getWorkLoop();
     else


@@ -3605,6 +4153,15 @@ IOReturn IOResources::setProperties( OSObject * properties )
        return( kIOReturnBadArgument);
 
     while( (key = OSDynamicCast(OSSymbol, iter->getNextObject()))) {
        return( kIOReturnBadArgument);
 
     while( (key = OSDynamicCast(OSSymbol, iter->getNextObject()))) {

+
+       if (gIOConsoleUsersKey == key)
+       {
+           IORegistryEntry::getRegistryRoot()->setProperty(key, dict->getObject(key));
+           OSIncrementAtomic( &gIOConsoleUsersSeed );
+           publishResource( gIOConsoleUsersSeedKey, gIOConsoleUsersSeedValue );
+           continue;
+       }
+

        publishResource( key, dict->getObject(key) );
     }
 
        publishResource( key, dict->getObject(key) );
     }
 


@@ -3811,6 +4368,12 @@ bool IOService::passiveMatch( OSDictionary * table, bool changesOK )
                     break;
             }
 
                     break;
             }
 

+            num = OSDynamicCast( OSNumber, table->getObject( gIORegistryEntryIDKey ));
+            if( num) {
+               done++;
+                match = (getRegistryEntryID() == num->unsigned64BitValue());
+           }
+

             num = OSDynamicCast( OSNumber, table->getObject( gIOMatchedServiceCountKey ));
             if( num) {
 
             num = OSDynamicCast( OSNumber, table->getObject( gIOMatchedServiceCountKey ));
             if( num) {
 


@@ -3866,6 +4429,12 @@ bool IOService::passiveMatch( OSDictionary * table, bool changesOK )
 
             if( !(match = where->compareProperty( table, kIOBSDNameKey )))
                 break;
 
             if( !(match = where->compareProperty( table, kIOBSDNameKey )))
                 break;

+            if( !(match = where->compareProperty( table, kIOBSDMajorKey )))
+                break;
+            if( !(match = where->compareProperty( table, kIOBSDMinorKey )))
+                break;
+            if( !(match = where->compareProperty( table, kIOBSDUnitKey )))
+                break;

 
             matchParent = false;
 
 
             matchParent = false;
 


@@ -3908,6 +4477,9 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
     IOUserClient *client;
     OSObject *temp;
 
     IOUserClient *client;
     OSObject *temp;
 

+    if (kIOReturnSuccess == newUserClient( owningTask, securityID, type, handler ))
+       return kIOReturnSuccess;
+

     // First try my own properties for a user client class name
     temp = getProperty(gIOUserClientClassKey);
     if (temp) {
     // First try my own properties for a user client class name
     temp = getProperty(gIOUserClientClassKey);
     if (temp) {


@@ -3925,6 +4497,7 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
     if (!userClientClass)
         return kIOReturnUnsupported;
 
     if (!userClientClass)
         return kIOReturnUnsupported;
 

+    // This reference is consumed by the IOServiceOpen call

     temp = OSMetaClass::allocClassWithName(userClientClass);
     if (!temp)
         return kIOReturnNoMemory;
     temp = OSMetaClass::allocClassWithName(userClientClass);
     if (!temp)
         return kIOReturnNoMemory;


@@ -3959,7 +4532,7 @@ IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
 IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
                                     UInt32 type, IOUserClient ** handler )
 {
 IOReturn IOService::newUserClient( task_t owningTask, void * securityID,
                                     UInt32 type, IOUserClient ** handler )
 {

-    return( newUserClient( owningTask, securityID, type, 0, handler ));
+    return( kIOReturnUnsupported );

 }
 
 IOReturn IOService::requestProbe( IOOptionBits options )
 }
 
 IOReturn IOService::requestProbe( IOOptionBits options )


@@ -4058,7 +4631,7 @@ int IOService::errnoFromReturn( IOReturn rtn )
         case kIOReturnBadArgument:
             return(EINVAL);
         case kIOReturnUnsupported:
         case kIOReturnBadArgument:
             return(EINVAL);
         case kIOReturnUnsupported:

-            return(EOPNOTSUPP);
+            return(ENOTSUP);

         case kIOReturnBusy:
             return(EBUSY);
         case kIOReturnNoPower:
         case kIOReturnBusy:
             return(EBUSY);
         case kIOReturnNoPower:


@@ -4089,7 +4662,6 @@ int IOService::errnoFromReturn( IOReturn rtn )
         case kIOReturnExclusiveAccess:
         case kIOReturnLockedRead:
         case kIOReturnLockedWrite:
         case kIOReturnExclusiveAccess:
         case kIOReturnLockedRead:
         case kIOReturnLockedWrite:

-        case kIOReturnNotAttached:

         case kIOReturnNotOpen:
         case kIOReturnNotReadable:
             return(EACCES);
         case kIOReturnNotOpen:
         case kIOReturnNotReadable:
             return(EACCES);


@@ -4102,6 +4674,7 @@ int IOService::errnoFromReturn( IOReturn rtn )
             return(EBUSY);
         case kIOReturnBadMedia:
         case kIOReturnNoMedia:
             return(EBUSY);
         case kIOReturnBadMedia:
         case kIOReturnNoMedia:

+        case kIOReturnNotAttached:

         case kIOReturnUnformattedMedia:
             return(ENXIO); // (media error)
         case kIOReturnDMAError:
         case kIOReturnUnformattedMedia:
             return(ENXIO); // (media error)
         case kIOReturnDMAError:


@@ -4169,7 +4742,7 @@ IODeviceMemory * IOService::getDeviceMemoryWithIndex( unsigned int index )
 }
 
 IOMemoryMap * IOService::mapDeviceMemoryWithIndex( unsigned int index,
 }
 
 IOMemoryMap * IOService::mapDeviceMemoryWithIndex( unsigned int index,

-                                               IOOptionBits options = 0 )
+                                               IOOptionBits options )

 {
     IODeviceMemory *   range;
     IOMemoryMap *      map;
 {
     IODeviceMemory *   range;
     IOMemoryMap *      map;


@@ -4194,6 +4767,200 @@ void IOService::setDeviceMemory( OSArray * array )
     setProperty( gIODeviceMemoryKey, array);
 }
 
     setProperty( gIODeviceMemoryKey, array);
 }
 

+/*
+ * For machines where the transfers on an I/O bus can stall because
+ * the CPU is in an idle mode, These APIs allow a driver to specify
+ * the maximum bus stall that they can handle.  0 indicates no limit.
+ */
+void IOService::
+setCPUSnoopDelay(UInt32 __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    ml_set_maxsnoop(ns); 
+#endif /* defined(__i386__) || defined(__x86_64__) */
+}
+
+UInt32 IOService::
+getCPUSnoopDelay()
+{
+#if defined(__i386__) || defined(__x86_64__)
+    return ml_get_maxsnoop(); 
+#else
+    return 0;
+#endif /* defined(__i386__) || defined(__x86_64__) */
+}
+
+#if defined(__i386__) || defined(__x86_64__)
+static void
+requireMaxCpuDelay(IOService * service, UInt32 ns, UInt32 delayType)
+{
+    static const UInt kNoReplace = -1U;        // Must be an illegal index
+    UInt replace = kNoReplace;
+    bool setCpuDelay = false;
+
+    IORecursiveLockLock(sCpuDelayLock);
+
+    UInt count = sCpuDelayData->getLength() / sizeof(CpuDelayEntry);
+    CpuDelayEntry *entries = (CpuDelayEntry *) sCpuDelayData->getBytesNoCopy();
+    IOService * holder = NULL;
+
+    if (ns) {
+        const CpuDelayEntry ne = {service, ns, delayType};
+       holder = service;
+        // Set maximum delay.
+        for (UInt i = 0; i < count; i++) {
+            IOService *thisService = entries[i].fService;
+            bool sameType = (delayType == entries[i].fDelayType);            
+            if ((service == thisService) && sameType)
+                replace = i;
+            else if (!thisService) {
+                if (kNoReplace == replace)
+                    replace = i;
+            }
+            else if (sameType) {
+                const UInt32 thisMax = entries[i].fMaxDelay;
+                if (thisMax < ns)
+               {
+                    ns = thisMax;
+                   holder = thisService;
+               }
+            }
+        }
+        
+        setCpuDelay = true;
+        if (kNoReplace == replace)
+            sCpuDelayData->appendBytes(&ne, sizeof(ne));
+        else
+            entries[replace] = ne;
+    }
+    else {
+        ns = -1U;      // Set to max unsigned, i.e. no restriction
+
+        for (UInt i = 0; i < count; i++) {
+            // Clear a maximum delay.
+            IOService *thisService = entries[i].fService;
+            if (thisService && (delayType == entries[i].fDelayType)) {
+                UInt32 thisMax = entries[i].fMaxDelay;
+                if (service == thisService)
+                    replace = i;
+                else if (thisMax < ns) {
+                    ns = thisMax;
+                   holder = thisService;
+               }
+            }
+        }
+
+        // Check if entry found
+        if (kNoReplace != replace) {
+            entries[replace].fService = 0;     // Null the entry
+            setCpuDelay = true;
+        }
+    }
+
+    if (setCpuDelay)
+    {
+        // Must be safe to call from locked context
+        if (delayType == kCpuDelayBusStall)
+        {
+            ml_set_maxbusdelay(ns);
+        }
+        else if (delayType == kCpuDelayInterrupt)
+        {
+            ml_set_maxintdelay(ns);
+        }
+
+       OSArray * handlers = sCpuLatencyHandlers[delayType];
+       IOService * target;
+       if (handlers) for (unsigned int idx = 0; 
+                           (target = (IOService *) handlers->getObject(idx));
+                           idx++)
+       {
+           target->callPlatformFunction(sCPULatencyFunctionName[delayType], false,
+                                           (void *) (uintptr_t) ns, holder,
+                                           NULL, NULL);
+       }
+    }
+
+    IORecursiveLockUnlock(sCpuDelayLock);
+}
+
+static IOReturn
+setLatencyHandler(UInt32 delayType, IOService * target, bool enable)
+{
+    IOReturn result = kIOReturnNotFound;
+    OSArray * array;
+    unsigned int idx;
+
+    IORecursiveLockLock(sCpuDelayLock);
+
+    do
+    {
+       if (enable && !sCpuLatencyHandlers[delayType])
+           sCpuLatencyHandlers[delayType] = OSArray::withCapacity(4);
+       array = sCpuLatencyHandlers[delayType];
+       if (!array)
+           break;
+       idx = array->getNextIndexOfObject(target, 0);
+       if (!enable)
+       {
+           if (-1U != idx)
+           {
+               array->removeObject(idx);
+               result = kIOReturnSuccess;
+           }
+       }
+       else
+       {
+           if (-1U != idx) {
+               result = kIOReturnExclusiveAccess;
+               break;
+           }
+           array->setObject(target);
+           
+           UInt count = sCpuDelayData->getLength() / sizeof(CpuDelayEntry);
+           CpuDelayEntry *entries = (CpuDelayEntry *) sCpuDelayData->getBytesNoCopy();
+           UInt32 ns = -1U;    // Set to max unsigned, i.e. no restriction
+           IOService * holder = NULL;
+
+           for (UInt i = 0; i < count; i++) {
+               if (entries[i].fService 
+                 && (delayType == entries[i].fDelayType) 
+                 && (entries[i].fMaxDelay < ns)) {
+                   ns = entries[i].fMaxDelay;
+                   holder = entries[i].fService;
+               }
+           }
+           target->callPlatformFunction(sCPULatencyFunctionName[delayType], false,
+                                           (void *) (uintptr_t) ns, holder,
+                                           NULL, NULL);
+           result = kIOReturnSuccess;
+       }
+    }
+    while (false);
+
+    IORecursiveLockUnlock(sCpuDelayLock);
+
+    return (result);
+}
+
+#endif /* defined(__i386__) || defined(__x86_64__) */
+
+void IOService::
+requireMaxBusStall(UInt32 __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    requireMaxCpuDelay(this, ns, kCpuDelayBusStall);
+#endif
+}
+
+void IOService::
+requireMaxInterruptDelay(uint32_t __unused ns)
+{
+#if defined(__i386__) || defined(__x86_64__)
+    requireMaxCpuDelay(this, ns, kCpuDelayInterrupt);
+#endif
+}
+

 /*
  * Device interrupts
  */
 /*
  * Device interrupts
  */


@@ -4350,13 +5117,21 @@ IOReturn IOService::causeInterrupt(int source)
   return interruptController->causeInterrupt(this, source);
 }
 
   return interruptController->causeInterrupt(this, source);
 }
 

-OSMetaClassDefineReservedUsed(IOService, 0);
-OSMetaClassDefineReservedUsed(IOService, 1);
-OSMetaClassDefineReservedUsed(IOService, 2);
-
+#if __LP64__
+OSMetaClassDefineReservedUnused(IOService, 0);
+OSMetaClassDefineReservedUnused(IOService, 1);
+OSMetaClassDefineReservedUnused(IOService, 2);

 OSMetaClassDefineReservedUnused(IOService, 3);
 OSMetaClassDefineReservedUnused(IOService, 4);
 OSMetaClassDefineReservedUnused(IOService, 5);
 OSMetaClassDefineReservedUnused(IOService, 3);
 OSMetaClassDefineReservedUnused(IOService, 4);
 OSMetaClassDefineReservedUnused(IOService, 5);

+#else
+OSMetaClassDefineReservedUsed(IOService, 0);
+OSMetaClassDefineReservedUsed(IOService, 1);
+OSMetaClassDefineReservedUsed(IOService, 2);
+OSMetaClassDefineReservedUsed(IOService, 3);
+OSMetaClassDefineReservedUsed(IOService, 4);
+OSMetaClassDefineReservedUsed(IOService, 5);
+#endif

 OSMetaClassDefineReservedUnused(IOService, 6);
 OSMetaClassDefineReservedUnused(IOService, 7);
 OSMetaClassDefineReservedUnused(IOService, 8);
 OSMetaClassDefineReservedUnused(IOService, 6);
 OSMetaClassDefineReservedUnused(IOService, 7);
 OSMetaClassDefineReservedUnused(IOService, 8);


@@ -4399,6 +5174,8 @@ OSMetaClassDefineReservedUnused(IOService, 44);
 OSMetaClassDefineReservedUnused(IOService, 45);
 OSMetaClassDefineReservedUnused(IOService, 46);
 OSMetaClassDefineReservedUnused(IOService, 47);
 OSMetaClassDefineReservedUnused(IOService, 45);
 OSMetaClassDefineReservedUnused(IOService, 46);
 OSMetaClassDefineReservedUnused(IOService, 47);

+
+#ifdef __ppc__

 OSMetaClassDefineReservedUnused(IOService, 48);
 OSMetaClassDefineReservedUnused(IOService, 49);
 OSMetaClassDefineReservedUnused(IOService, 50);
 OSMetaClassDefineReservedUnused(IOService, 48);
 OSMetaClassDefineReservedUnused(IOService, 49);
 OSMetaClassDefineReservedUnused(IOService, 50);


@@ -4415,3 +5192,4 @@ OSMetaClassDefineReservedUnused(IOService, 60);
 OSMetaClassDefineReservedUnused(IOService, 61);
 OSMetaClassDefineReservedUnused(IOService, 62);
 OSMetaClassDefineReservedUnused(IOService, 63);
 OSMetaClassDefineReservedUnused(IOService, 61);
 OSMetaClassDefineReservedUnused(IOService, 62);
 OSMetaClassDefineReservedUnused(IOService, 63);

+#endif