xnu-792.24.17.tar.gz

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

diff --git a/iokit/Kernel/IOPlatformExpert.cpp b/iokit/Kernel/IOPlatformExpert.cpp
index d5b9f7f5b304a05cbcb4744c77de0be03104322a..1fa9a6ec770db69951dc3da6083e0d6928525372 100644 (file)
--- a/iokit/Kernel/IOPlatformExpert.cpp
+++ b/iokit/Kernel/IOPlatformExpert.cpp
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@

  * 
  * 

- * 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.
+ * 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.

  * 
  * 

- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * 

- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@

  */
 /*
  * HISTORY
  */
 /*
  * HISTORY


@@ -51,9 +45,6 @@ extern "C" {
 #include <pexpert/pexpert.h>
 }
 
 #include <pexpert/pexpert.h>
 }
 

-/* Delay period for UPS halt */
-#define kUPSDelayHaltCPU_msec   (1000*60*5)
-

 void printDictionaryKeys (OSDictionary * inDictionary, char * inMsg);
 static void getCStringForObject (OSObject * inObj, char * outStr);
 
 void printDictionaryKeys (OSDictionary * inDictionary, char * inMsg);
 static void getCStringForObject (OSObject * inObj, char * outStr);
 


@@ -249,18 +240,20 @@ int (*PE_halt_restart)(unsigned int type) = 0;
 
 int IOPlatformExpert::haltRestart(unsigned int type)
 {
 
 int IOPlatformExpert::haltRestart(unsigned int type)
 {

-  if (type == kPEHangCPU) while (1);
-
-  if (type == kPEUPSDelayHaltCPU) {
-    // Stall shutdown for 5 minutes, and if no outside force has 
-    // removed our power at that point, proceed with a reboot.
-    IOSleep( kUPSDelayHaltCPU_msec );
+  IOPMrootDomain *rd = getPMRootDomain();
+  OSBoolean   *b = 0;
+    
+  if(rd) b = (OSBoolean *)OSDynamicCast(OSBoolean, rd->getProperty(OSString::withCString("StallSystemAtHalt")));

 
 

-    // Ideally we never reach this point.
+  if (type == kPEHangCPU) while (1);

 
 

+  if (kOSBooleanTrue == b) {
+    // Stall shutdown for 5 minutes, and if no outside force has removed our power, continue with
+    // a reboot.
+    IOSleep(1000*60*5);

     type = kPERestartCPU;
   }
     type = kPERestartCPU;
   }

-  kprintf("platform halt restart\n");
+  

   if (PE_halt_restart) return (*PE_halt_restart)(type);
   else return -1;
 }
   if (PE_halt_restart) return (*PE_halt_restart)(type);
   else return -1;
 }


@@ -731,17 +724,15 @@ static void getCStringForObject (OSObject * inObj, char * outStr)
    }
 }
 
    }
 }
 

-/* IOShutdownNotificationsTimedOut
+/* IOPMPanicOnShutdownHang

  * - Called from a timer installed by PEHaltRestart
  */
  * - Called from a timer installed by PEHaltRestart
  */

-static void IOShutdownNotificationsTimedOut(
-    thread_call_param_t p0, 
-    thread_call_param_t p1)
+static void IOPMPanicOnShutdownHang(thread_call_param_t p0, thread_call_param_t p1)

 {
     int type = (int)p0;
 
     /* 30 seconds has elapsed - resume shutdown */
 {
     int type = (int)p0;
 
     /* 30 seconds has elapsed - resume shutdown */

-    if(gIOPlatform) gIOPlatform->haltRestart(type);
+    gIOPlatform->haltRestart(type);

 }
 
 
 }
 
 


@@ -781,9 +772,8 @@ int PEHaltRestart(unsigned int type)
   bool              noWaitForResponses;
   AbsoluteTime      deadline;
   thread_call_t     shutdown_hang;
   bool              noWaitForResponses;
   AbsoluteTime      deadline;
   thread_call_t     shutdown_hang;

-  unsigned int      tell_type;

   
   

-  if(type == kPEHaltCPU || type == kPERestartCPU || type == kPEUPSDelayHaltCPU)
+  if(type == kPEHaltCPU || type == kPERestartCPU)

   {
     /* Notify IOKit PM clients of shutdown/restart
        Clients subscribe to this message with a call to
   {
     /* Notify IOKit PM clients of shutdown/restart
        Clients subscribe to this message with a call to


@@ -794,19 +784,11 @@ int PEHaltRestart(unsigned int type)
        If all goes well the machine will be off by the time
        the timer expires.
      */
        If all goes well the machine will be off by the time
        the timer expires.
      */

-    shutdown_hang = thread_call_allocate( &IOShutdownNotificationsTimedOut, 
-                        (thread_call_param_t) type);
+    shutdown_hang = thread_call_allocate( &IOPMPanicOnShutdownHang, (thread_call_param_t) type);

     clock_interval_to_deadline( 30, kSecondScale, &deadline );
     thread_call_enter1_delayed( shutdown_hang, 0, deadline );
     
     clock_interval_to_deadline( 30, kSecondScale, &deadline );
     thread_call_enter1_delayed( shutdown_hang, 0, deadline );
     

-
-    if( kPEUPSDelayHaltCPU == type ) {
-        tell_type = kPEHaltCPU;
-    } else {
-        tell_type = type;
-    }
-
-    noWaitForResponses = pmRootDomain->tellChangeDown2(tell_type); 
+    noWaitForResponses = pmRootDomain->tellChangeDown2(type); 

     /* This notification should have few clients who all do 
        their work synchronously.
              
     /* This notification should have few clients who all do 
        their work synchronously.
              


@@ -830,18 +812,16 @@ UInt32 PESavePanicInfo(UInt8 *buffer, UInt32 length)
 
 long PEGetGMTTimeOfDay(void)
 {
 
 long PEGetGMTTimeOfDay(void)
 {

-       long    result = 0;
-

     if( gIOPlatform)
     if( gIOPlatform)

-               result = gIOPlatform->getGMTTimeOfDay();
-
-       return (result);
+       return( gIOPlatform->getGMTTimeOfDay());
+    else
+       return( 0 );

 }
 
 void PESetGMTTimeOfDay(long secs)
 {
     if( gIOPlatform)
 }
 
 void PESetGMTTimeOfDay(long secs)
 {
     if( gIOPlatform)

-               gIOPlatform->setGMTTimeOfDay(secs);
+       gIOPlatform->setGMTTimeOfDay(secs);

 }
 
 } /* extern "C" */
 }
 
 } /* extern "C" */


@@ -1234,12 +1214,6 @@ void IOPlatformExpertDevice::free()
         workLoop->release();
 }
 
         workLoop->release();
 }
 

-bool IOPlatformExpertDevice::attachToChild( IORegistryEntry * child,
-                                        const IORegistryPlane * plane )
-{
-    return IOService::attachToChild( child, plane );
-}
-

 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #undef super
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #undef super