--- xnu/xnu-792/iokit/Kernel/IOPMPowerStateQueue.cpp
+++ xnu/xnu-8796.141.3/iokit/Kernel/IOPMPowerStateQueue.cpp
@@ -1,98 +1,105 @@
 /*
  * Copyright (c) 2001-2002 Apple Computer, 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,
- * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
- 
+
 #include "IOPMPowerStateQueue.h"
-#undef super
+
 #define super IOEventSource
-OSDefineMetaClassAndStructors(IOPMPowerStateQueue, IOEventSource);
+OSDefineMetaClassAndStructors( IOPMPowerStateQueue, IOEventSource )
 
-IOPMPowerStateQueue *IOPMPowerStateQueue::PMPowerStateQueue(OSObject *inOwner)
+IOPMPowerStateQueue * IOPMPowerStateQueue::PMPowerStateQueue(
+	OSObject * inOwner, Action inAction )
 {
-    IOPMPowerStateQueue     *me = new IOPMPowerStateQueue;
+	IOPMPowerStateQueue * me = new IOPMPowerStateQueue;
 
-    if(me && !me->init(inOwner, 0) )
-    {
-        me->release();
-        return NULL;
-    }
+	if (me && !me->init(inOwner, inAction)) {
+		me->release();
+		return NULL;
+	}
 
-    return me;
+	return me;
 }
 
-bool IOPMPowerStateQueue::init(OSObject *owner, Action action)
+bool
+IOPMPowerStateQueue::init( OSObject * inOwner, Action inAction )
 {
-    if(!(super::init(owner, (IOEventSource::Action) action))) return false;
+	if (!inAction || !(super::init(inOwner, inAction))) {
+		return false;
+	}
 
-    // Queue of powerstate changes
-    changes = NULL;
+	queue_init( &queueHead );
 
-    return true;
+	queueLock = IOLockAlloc();
+	if (!queueLock) {
+		return false;
+	}
+
+	return true;
 }
 
+bool
+IOPMPowerStateQueue::submitPowerEvent(
+	uint32_t eventType,
+	void *   arg0,
+	uint64_t arg1 )
+{
+	PowerEventEntry * entry;
 
-bool IOPMPowerStateQueue::unIdleOccurred(IOService *inTarget, unsigned long inState)
-{
-    PowerChangeEntry             *new_one = NULL;
+	entry = IOMallocType(PowerEventEntry);
 
-    new_one = (PowerChangeEntry *)IOMalloc(sizeof(PowerChangeEntry));
-    if(!new_one) return false;
-    
-    new_one->actionType = IOPMPowerStateQueue::kUnIdle;
-    new_one->state = inState;
-    new_one->target = inTarget;
-    
-    // Change to queue
-    OSEnqueueAtomic((void **)&changes, (void *)new_one, 0);
-    
-    signalWorkAvailable();
+	entry->eventType = eventType;
+	entry->arg0 = arg0;
+	entry->arg1 = arg1;
 
-    return true;
+	IOLockLock(queueLock);
+	queue_enter(&queueHead, entry, PowerEventEntry *, chain);
+	IOLockUnlock(queueLock);
+	signalWorkAvailable();
+
+	return true;
 }
 
-// checkForWork() is called in a gated context
-bool IOPMPowerStateQueue::checkForWork()
+bool
+IOPMPowerStateQueue::checkForWork( void )
 {
-    PowerChangeEntry            *theNode;
-    int                         theState;
-    IOService                   *theTarget;
-    UInt16                      theAction;
-    
-    // Dequeue and process the state change request
-    if((theNode = (PowerChangeEntry *)OSDequeueAtomic((void **)&changes, 0)))
-    {
-        theState = theNode->state;
-        theTarget = theNode->target;
-        theAction = theNode->actionType;
-        IOFree((void *)theNode, sizeof(PowerChangeEntry));
-        
-        switch (theAction)
-        {
-            case kUnIdle:
-                theTarget->command_received(theState, 0, 0, 0);
-                break;
-        }
-    }
+	IOPMPowerStateQueueAction queueAction = (IOPMPowerStateQueueAction) action;
+	PowerEventEntry * entry;
 
-    // Return true if there's more work to be done
-    if(changes) return true;
-    else return false;
+	IOLockLock(queueLock);
+	while (!queue_empty(&queueHead)) {
+		queue_remove_first(&queueHead, entry, PowerEventEntry *, chain);
+		IOLockUnlock(queueLock);
+
+		(*queueAction)(owner, entry->eventType, entry->arg0, entry->arg1);
+		IOFreeType(entry, PowerEventEntry);
+
+		IOLockLock(queueLock);
+	}
+	IOLockUnlock(queueLock);
+
+	return false;
 }