xnu-1228.7.58.tar.gz

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

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