xnu-344.23.tar.gz

[apple/xnu.git] / iokit / Families / IOADBBus / IOADBController.cpp

diff --git a/iokit/Families/IOADBBus/IOADBController.cpp b/iokit/Families/IOADBBus/IOADBController.cpp
index 14cafcc48981e4474e681ba14127c7d966332eea..76ff4cdf4b5e604736c22ba2fb086d04a869625a 100644 (file)
--- a/iokit/Families/IOADBBus/IOADBController.cpp
+++ b/iokit/Families/IOADBBus/IOADBController.cpp
@@ -151,13 +151,12 @@ bool ADBhasRoot( OSObject * us, void *, IOService * yourDevice )
 IOReturn IOADBController::powerStateWillChangeTo ( IOPMPowerFlags theFlags, unsigned long, IOService*)
 {
     int i;
-
-    if ( ! (theFlags & IOPMPowerOn) ) {
+    if ( ! (theFlags & kIOPMPowerOn) && ! (theFlags & kIOPMDoze) ) {
         busProbed = false;
         for ( i = 1; i < ADB_DEVICE_COUNT; i++ ) {
             if( adbDevices[ i ] != NULL ) {
                 if ( adbDevices[ i ]->nub ) {
-                    adbDevices[ i ]->nub->terminate(kIOServiceRequired);
+                    adbDevices[ i ]->nub->terminate(kIOServiceRequired | kIOServiceSynchronous);
                     adbDevices[ i ]->nub->release();
                 }
                 IOFree( adbDevices[ i ], sizeof (ADBDeviceControl));
@@ -178,7 +177,7 @@ IOReturn IOADBController::powerStateWillChangeTo ( IOPMPowerFlags theFlags, unsi
 //*********************************************************************************
 IOReturn IOADBController::powerStateDidChangeTo ( IOPMPowerFlags theFlags, unsigned long, IOService*)
 {
-    if ( theFlags & IOPMPowerOn ) {
+    if ( (theFlags & kIOPMPowerOn) || (theFlags & kIOPMDoze) ) {
         if ( ! busProbed ) {
             thread_call_enter(probeThread);
             busProbed = true;
@@ -288,14 +287,9 @@ IOReturn IOADBController::probeBus ( void )
     const OSNumber * object;
     const OSSymbol * key;
 
-    /* Waits one second for the trackpads to be up */
-    
-    IOSleep(1500);
-
     /* Kill the auto poll until a new dev id's have been setup */
-
     setAutoPollEnable(false);
-
+    
     /*
      * Send a ADB bus reset - reply is sent after bus has reset,
      * so there is no need to wait for the reset to complete.
@@ -303,10 +297,6 @@ IOReturn IOADBController::probeBus ( void )
     
     resetBus();
 
-    /* Waits one second for the trackpads to be up */
-    
-    IOSleep(1500);
-
     /*
      * Okay, now attempt reassign the
      * bus
@@ -323,7 +313,7 @@ IOReturn IOADBController::probeBus ( void )
             }
     }
 
-    /* Now attempt to reassign the addresses */
+/* Now attempt to reassign the addresses */
     while( unresolvedAddrs) {
         if( !freeAddrs) {
             panic("ADB: Cannot find a free ADB slot for reassignment!");
@@ -471,8 +461,9 @@ IOReturn IOADBController::probeBus ( void )
             newDev->release();
             continue;
         }
-        newDev->registerService();
         newDev->start(this);
+        newDev->registerService();
+        newDev->waitQuiet();
     }                                                  // repeat loop
     return kIOReturnSuccess;
 }
@@ -530,12 +521,12 @@ bool IOADBController::matchNubWithPropertyTable( IOService * device, OSDictionar
             keys++;
         }
         else {
-            if( deviceInfo->defaultAddress != strtol(keys, &keys, 16)) {
+            if( deviceInfo->defaultAddress != strtol(keys, (char **) &keys, 16)) {
                 break;
             }
         }
         if( *keys++ == '-' ) {
-            if( deviceInfo->defaultHandlerID != strtol(keys, &keys, 16)) {
+            if( deviceInfo->defaultHandlerID != strtol(keys, (char **) &keys, 16)) {
                 break;
             }
         }
@@ -556,8 +547,8 @@ IOReturn IOADBController::setOwner ( void * device, IOService * client, ADB_call
 {
    ADBDeviceControl * deviceInfo = (ADBDeviceControl *)device;
 
-   deviceInfo->owner = client;
    deviceInfo->handler = handler;
+   deviceInfo->owner = client;
    return kIOReturnSuccess;
 }
 
@@ -687,6 +678,16 @@ UInt8 IOADBController::defaultHandlerID ( ADBDeviceControl * busRef )
 }
 
 
+// **********************************************************************************
+// cancelAllIO
+//
+// **********************************************************************************
+IOReturn IOADBController::cancelAllIO ( void )
+{
+    return kIOReturnSuccess;
+}
+
+
 // **********************************************************************************
 // flush
 //