--- xnu/xnu-12377.101.15/iokit/Kernel/IOPowerConnection.cpp
+++ xnu/xnu-517/iokit/Kernel/IOPowerConnection.cpp
@@ -1,20 +1,17 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
  * 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.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ * compliance with the License. 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,
@@ -22,14 +19,14 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
+ * 
+ * @APPLE_LICENSE_HEADER_END@
  */
 
 #include <IOKit/pwr_mgt/IOPowerConnection.h>
 
 #define super IOService
-OSDefineMetaClassAndStructors(IOPowerConnection, IOService)
+OSDefineMetaClassAndStructors(IOPowerConnection,IOService)
 
 
 // **********************************************************************************
@@ -37,10 +34,9 @@
 //
 // Parent of the connection calls here to save the childs desire
 // **********************************************************************************
-void
-IOPowerConnection::setDesiredDomainState(unsigned long stateNumber )
+void IOPowerConnection::setDesiredDomainState (unsigned long stateNumber )
 {
-	desiredDomainState = stateNumber;
+    desiredDomainState = stateNumber;
 }
 
 
@@ -48,10 +44,9 @@
 // getDesiredDomainState
 //
 // **********************************************************************************
-unsigned long
-IOPowerConnection::getDesiredDomainState( void )
+unsigned long IOPowerConnection::getDesiredDomainState ( void )
 {
-	return desiredDomainState;
+    return desiredDomainState;
 }
 
 
@@ -60,10 +55,9 @@
 //
 // Parent of the connection calls here when the child requests power
 // **********************************************************************************
-void
-IOPowerConnection::setChildHasRequestedPower( void )
+void IOPowerConnection::setChildHasRequestedPower ( void )
 {
-	requestFlag = true;
+    requestFlag = true;
 }
 
 // **********************************************************************************
@@ -71,10 +65,9 @@
 //
 // Parent of the connection calls here when the child requests power
 // **********************************************************************************
-bool
-IOPowerConnection::childHasRequestedPower( void )
+bool IOPowerConnection::childHasRequestedPower ( void )
 {
-	return requestFlag;
+    return requestFlag;
 }
 
 
@@ -82,10 +75,9 @@
 // setPreventIdleSleepFlag
 //
 // **********************************************************************************
-void
-IOPowerConnection::setPreventIdleSleepFlag( unsigned long flag )
+void IOPowerConnection::setPreventIdleSleepFlag ( unsigned long flag )
 {
-	preventIdleSleepFlag = (flag != 0);
+    preventIdleSleepFlag = (flag != 0);
 }
 
 
@@ -93,10 +85,9 @@
 // getPreventIdleSleepFlag
 //
 // **********************************************************************************
-bool
-IOPowerConnection::getPreventIdleSleepFlag( void )
+bool IOPowerConnection::getPreventIdleSleepFlag ( void )
 {
-	return preventIdleSleepFlag;
+    return preventIdleSleepFlag;
 }
 
 
@@ -104,10 +95,9 @@
 // setPreventSystemSleepFlag
 //
 // **********************************************************************************
-void
-IOPowerConnection::setPreventSystemSleepFlag( unsigned long flag )
+void IOPowerConnection::setPreventSystemSleepFlag ( unsigned long flag )
 {
-	preventSystemSleepFlag = (flag != 0);
+    preventSystemSleepFlag = (flag != 0);
 }
 
 
@@ -115,10 +105,9 @@
 // getPreventSystemSleepFlag
 //
 // **********************************************************************************
-bool
-IOPowerConnection::getPreventSystemSleepFlag( void )
+bool IOPowerConnection::getPreventSystemSleepFlag ( void )
 {
-	return preventSystemSleepFlag;
+    return preventSystemSleepFlag;
 }
 
 
@@ -128,10 +117,9 @@
 // Child of the connection calls here to set its reminder that the parent does
 // or does not yet know the state if its domain.
 // **********************************************************************************
-void
-IOPowerConnection::setParentKnowsState(bool flag )
+void IOPowerConnection::setParentKnowsState (bool flag )
 {
-	stateKnown = flag;
+    stateKnown = flag;
 }
 
 
@@ -141,10 +129,9 @@
 // Child of the connection calls here to save what the parent says
 // is the state if its domain.
 // **********************************************************************************
-void
-IOPowerConnection::setParentCurrentPowerFlags(IOPMPowerFlags flags )
+void IOPowerConnection::setParentCurrentPowerFlags (IOPMPowerFlags flags )
 {
-	currentPowerFlags = flags;
+    currentPowerFlags = flags;
 }
 
 
@@ -152,10 +139,9 @@
 // parentKnowsState
 //
 // **********************************************************************************
-bool
-IOPowerConnection::parentKnowsState(void )
+bool IOPowerConnection::parentKnowsState (void )
 {
-	return stateKnown;
+    return stateKnown;
 }
 
 
@@ -163,10 +149,9 @@
 // parentCurrentPowerFlags
 //
 // **********************************************************************************
-IOPMPowerFlags
-IOPowerConnection::parentCurrentPowerFlags(void )
+IOPMPowerFlags IOPowerConnection::parentCurrentPowerFlags (void )
 {
-	return currentPowerFlags;
+    return currentPowerFlags;
 }
 
 
@@ -174,10 +159,9 @@
 // setAwaitingAck
 //
 // **********************************************************************************
-void
-IOPowerConnection::setAwaitingAck( bool value )
+void IOPowerConnection::setAwaitingAck ( bool value )
 {
-	awaitingAck = value;
+    awaitingAck = value;
 }
 
 
@@ -185,30 +169,7 @@
 // getAwaitingAck
 //
 // **********************************************************************************
-bool
-IOPowerConnection::getAwaitingAck( void )
+bool IOPowerConnection::getAwaitingAck ( void )
 {
-	return awaitingAck;
+    return awaitingAck;
 }
-
-
-// **********************************************************************************
-// setReadyFlag
-//
-// **********************************************************************************
-void
-IOPowerConnection::setReadyFlag( bool flag )
-{
-	readyFlag = flag;
-}
-
-
-// **********************************************************************************
-// getReadyFlag
-//
-// **********************************************************************************
-bool
-IOPowerConnection::getReadyFlag( void ) const
-{
-	return readyFlag;
-}