--- xnu/xnu-1228/iokit/Kernel/IOPMPowerStateQueue.cpp
+++ xnu/xnu-8796.121.2/iokit/Kernel/IOPMPowerStateQueue.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 2001-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_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
@@ -11,10 +11,10 @@
  * 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.
- * 
+ *
  * 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,169 +22,84 @@
  * 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@
  */
- 
+
 #include "IOPMPowerStateQueue.h"
-#include "IOKit/IOLocks.h"
-#undef super
+
 #define super IOEventSource
-OSDefineMetaClassAndStructors(IOPMPowerStateQueue, IOEventSource);
+OSDefineMetaClassAndStructors( IOPMPowerStateQueue, IOEventSource )
 
-#ifndef __ppc__ /* ppc does this right and doesn't need these routines */
-static
-void *	OSDequeueAtomic(void * volatile * inList, SInt32 inOffset)
-{	
-	/* The _pointer_ is volatile, not the listhead itself */
-	void * volatile	oldListHead;
-	void * volatile	newListHead;
+IOPMPowerStateQueue * IOPMPowerStateQueue::PMPowerStateQueue(
+	OSObject * inOwner, Action inAction )
+{
+	IOPMPowerStateQueue * me = new IOPMPowerStateQueue;
 
-	do {
-		oldListHead = *inList;
-		if (oldListHead == NULL) {
-			break;
-		}
-		
-		newListHead = *(void * volatile *) (((char *) oldListHead) + inOffset);
-	} while (! OSCompareAndSwap((UInt32)oldListHead,
-					(UInt32)newListHead, (volatile UInt32 *)inList));
-	return oldListHead;
+	if (me && !me->init(inOwner, inAction)) {
+		me->release();
+		return NULL;
+	}
+
+	return me;
 }
 
-static
-void	OSEnqueueAtomic(void * volatile * inList, void * inNewLink, SInt32 inOffset)
+bool
+IOPMPowerStateQueue::init( OSObject * inOwner, Action inAction )
 {
-	/* The _pointer_ is volatile, not the listhead itself */
-	void *	volatile oldListHead;
-	void *	volatile newListHead = inNewLink;
-	void * volatile *	newLinkNextPtr = (void * volatile *) (((char *) inNewLink) + inOffset);
+	if (!inAction || !(super::init(inOwner, inAction))) {
+		return false;
+	}
 
-	do {
-		oldListHead = *inList;
-		*newLinkNextPtr = oldListHead;
-	} while (! OSCompareAndSwap((UInt32)oldListHead, (UInt32)newListHead,
-					(volatile UInt32 *)inList));
-}
-#endif /* ! __ppc__ */
+	queue_init( &queueHead );
 
+	queueLock = IOLockAlloc();
+	if (!queueLock) {
+		return false;
+	}
 
-IOPMPowerStateQueue *IOPMPowerStateQueue::PMPowerStateQueue(OSObject *inOwner)
-{
-    IOPMPowerStateQueue     *me = new IOPMPowerStateQueue;
-
-    if(me && !me->init(inOwner, 0) )
-    {
-        me->release();
-        return NULL;
-    }
-
-    return me;
+	return true;
 }
 
-bool IOPMPowerStateQueue::init(OSObject *owner, Action action)
+bool
+IOPMPowerStateQueue::submitPowerEvent(
+	uint32_t eventType,
+	void *   arg0,
+	uint64_t arg1 )
 {
-    if(!(super::init(owner, (IOEventSource::Action) action))) return false;
+	PowerEventEntry * entry;
 
-    // Queue of powerstate changes
-    changes = NULL;
-#ifndef __ppc__
-    if (!(tmpLock = IOLockAlloc()))  panic("IOPMPowerStateQueue::init can't alloc lock");
-#endif
-    return true;
+	entry = IOMallocType(PowerEventEntry);
+
+	entry->eventType = eventType;
+	entry->arg0 = arg0;
+	entry->arg1 = arg1;
+
+	IOLockLock(queueLock);
+	queue_enter(&queueHead, entry, PowerEventEntry *, chain);
+	IOLockUnlock(queueLock);
+	signalWorkAvailable();
+
+	return true;
 }
 
+bool
+IOPMPowerStateQueue::checkForWork( void )
+{
+	IOPMPowerStateQueueAction queueAction = (IOPMPowerStateQueueAction) action;
+	PowerEventEntry * entry;
 
-bool IOPMPowerStateQueue::unIdleOccurred(IOService *inTarget, unsigned long inState)
-{
-    PowerChangeEntry             *new_one = NULL;
+	IOLockLock(queueLock);
+	while (!queue_empty(&queueHead)) {
+		queue_remove_first(&queueHead, entry, PowerEventEntry *, chain);
+		IOLockUnlock(queueLock);
 
-    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
-#ifndef __ppc__
-    IOLockLock(tmpLock);
-#endif
-    OSEnqueueAtomic((void **)&changes, (void *)new_one, 0);
-#ifndef __ppc__
-    IOLockUnlock(tmpLock);
-#endif
-    signalWorkAvailable();
+		(*queueAction)(owner, entry->eventType, entry->arg0, entry->arg1);
+		IOFreeType(entry, PowerEventEntry);
 
-    return true;
+		IOLockLock(queueLock);
+	}
+	IOLockUnlock(queueLock);
+
+	return false;
 }
-
-bool IOPMPowerStateQueue::featureChangeOccurred(
-    uint32_t inState, 
-    IOService *inTarget)
-{
-    PowerChangeEntry             *new_one = NULL;
-
-    new_one = (PowerChangeEntry *)IOMalloc(sizeof(PowerChangeEntry));
-    if(!new_one) return false;
-    
-    new_one->actionType = IOPMPowerStateQueue::kPMFeatureChange;
-    new_one->state = inState;
-    new_one->target = inTarget;
-    
-    // Change to queue
-#ifdef __i386__
-    IOLockLock(tmpLock);
-#endif
-    OSEnqueueAtomic((void **)&changes, (void *)new_one, 0);
-#ifdef __i386__
-    IOLockUnlock(tmpLock);
-#endif
-    signalWorkAvailable();
-
-    return true;
-}
-
-
-// checkForWork() is called in a gated context
-bool IOPMPowerStateQueue::checkForWork()
-{
-    PowerChangeEntry            *theNode;
-    uint32_t                    theState;
-    IOService                   *theTarget;
-    uint16_t                    theAction;
-    
-    // Dequeue and process the state change request
-#ifndef __ppc__
-    IOLockLock(tmpLock);
-#endif
-    if((theNode = (PowerChangeEntry *)OSDequeueAtomic((void **)&changes, 0)))
-    {
-#ifndef __ppc__
-      IOLockUnlock(tmpLock);
-#endif
-        theState = theNode->state;
-        theTarget = theNode->target;
-        theAction = theNode->actionType;
-        IOFree((void *)theNode, sizeof(PowerChangeEntry));
-        
-        switch (theAction)
-        {
-            case kUnIdle:
-                theTarget->command_received((void *)theState, 0, 0, 0);
-                break;
-                
-            case kPMFeatureChange:
-                theTarget->messageClients(theState, theTarget);
-                break;
-        }
-    }
-#ifndef __ppc__
-    else {
-      IOLockUnlock(tmpLock);
-    }
-#endif
-    // Return true if there's more work to be done
-    if(changes) return true;
-    else return false;
-}