--- xnu/xnu-1228/iokit/Kernel/IOPMPowerStateQueue.cpp
+++ xnu/xnu-792.18.15/iokit/Kernel/IOPMPowerStateQueue.cpp
@@ -32,13 +32,12 @@
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOPMPowerStateQueue, IOEventSource);
 
-#ifndef __ppc__ /* ppc does this right and doesn't need these routines */
+#ifdef __i386__ /* 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;
+void *	OSDequeueAtomic(void ** inList, SInt32 inOffset)
+{
+	void *	oldListHead;
+	void *	newListHead;
 
 	do {
 		oldListHead = *inList;
@@ -46,27 +45,26 @@
 			break;
 		}
 		
-		newListHead = *(void * volatile *) (((char *) oldListHead) + inOffset);
+		newListHead = *(void **) (((char *) oldListHead) + inOffset);
 	} while (! OSCompareAndSwap((UInt32)oldListHead,
-					(UInt32)newListHead, (volatile UInt32 *)inList));
+					(UInt32)newListHead, (UInt32 *)inList));
 	return oldListHead;
 }
 
 static
-void	OSEnqueueAtomic(void * volatile * inList, void * inNewLink, SInt32 inOffset)
+void	OSEnqueueAtomic(void ** inList, void * inNewLink, SInt32 inOffset)
 {
-	/* The _pointer_ is volatile, not the listhead itself */
-	void *	volatile oldListHead;
-	void *	volatile newListHead = inNewLink;
-	void * volatile *	newLinkNextPtr = (void * volatile *) (((char *) inNewLink) + inOffset);
+	void *	oldListHead;
+	void *	newListHead = inNewLink;
+	void **	newLinkNextPtr = (void **) (((char *) inNewLink) + inOffset);
 
 	do {
 		oldListHead = *inList;
 		*newLinkNextPtr = oldListHead;
 	} while (! OSCompareAndSwap((UInt32)oldListHead, (UInt32)newListHead,
-					(volatile UInt32 *)inList));
+					(UInt32 *)inList));
 }
-#endif /* ! __ppc__ */
+#endif /* __i386__ */
 
 
 IOPMPowerStateQueue *IOPMPowerStateQueue::PMPowerStateQueue(OSObject *inOwner)
@@ -88,7 +86,7 @@
 
     // Queue of powerstate changes
     changes = NULL;
-#ifndef __ppc__
+#ifdef __i386__
     if (!(tmpLock = IOLockAlloc()))  panic("IOPMPowerStateQueue::init can't alloc lock");
 #endif
     return true;
@@ -107,32 +105,6 @@
     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();
-
-    return true;
-}
-
-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
@@ -145,22 +117,21 @@
     return true;
 }
 
-
 // checkForWork() is called in a gated context
 bool IOPMPowerStateQueue::checkForWork()
 {
     PowerChangeEntry            *theNode;
-    uint32_t                    theState;
+    int                         theState;
     IOService                   *theTarget;
-    uint16_t                    theAction;
+    UInt16                      theAction;
     
     // Dequeue and process the state change request
-#ifndef __ppc__
+#ifdef __i386__
     IOLockLock(tmpLock);
 #endif
     if((theNode = (PowerChangeEntry *)OSDequeueAtomic((void **)&changes, 0)))
     {
-#ifndef __ppc__
+#ifdef __i386__
       IOLockUnlock(tmpLock);
 #endif
         theState = theNode->state;
@@ -173,13 +144,9 @@
             case kUnIdle:
                 theTarget->command_received((void *)theState, 0, 0, 0);
                 break;
-                
-            case kPMFeatureChange:
-                theTarget->messageClients(theState, theTarget);
-                break;
         }
     }
-#ifndef __ppc__
+#ifdef __i386__
     else {
       IOLockUnlock(tmpLock);
     }