xnu-792.10.96.tar.gz

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

diff --git a/iokit/Kernel/IOPMPowerStateQueue.cpp b/iokit/Kernel/IOPMPowerStateQueue.cpp
index 8f976a9dbcb20384b80bedebd691c36b48dedeb5..54fc10387c053cea9619d916924f5ce3fd2ea187 100644 (file)
--- a/iokit/Kernel/IOPMPowerStateQueue.cpp
+++ b/iokit/Kernel/IOPMPowerStateQueue.cpp
@@ -21,10 +21,46 @@
  */
  
 #include "IOPMPowerStateQueue.h"
+#include "IOKit/IOLocks.h"
 #undef super
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOPMPowerStateQueue, IOEventSource);
 
+#ifdef __i386__ /* ppc does this right and doesn't need these routines */
+static
+void * OSDequeueAtomic(void ** inList, SInt32 inOffset)
+{
+       void *  oldListHead;
+       void *  newListHead;
+
+       do {
+               oldListHead = *inList;
+               if (oldListHead == NULL) {
+                       break;
+               }
+               
+               newListHead = *(void **) (((char *) oldListHead) + inOffset);
+       } while (! OSCompareAndSwap((UInt32)oldListHead,
+                                       (UInt32)newListHead, (UInt32 *)inList));
+       return oldListHead;
+}
+
+static
+void   OSEnqueueAtomic(void ** inList, void * inNewLink, SInt32 inOffset)
+{
+       void *  oldListHead;
+       void *  newListHead = inNewLink;
+       void ** newLinkNextPtr = (void **) (((char *) inNewLink) + inOffset);
+
+       do {
+               oldListHead = *inList;
+               *newLinkNextPtr = oldListHead;
+       } while (! OSCompareAndSwap((UInt32)oldListHead, (UInt32)newListHead,
+                                       (UInt32 *)inList));
+}
+#endif /* __i386__ */
+
+
 IOPMPowerStateQueue *IOPMPowerStateQueue::PMPowerStateQueue(OSObject *inOwner)
 {
     IOPMPowerStateQueue     *me = new IOPMPowerStateQueue;
@@ -44,7 +80,9 @@ bool IOPMPowerStateQueue::init(OSObject *owner, Action action)
 
     // Queue of powerstate changes
     changes = NULL;
-
+#ifdef __i386__
+    if (!(tmpLock = IOLockAlloc()))  panic("IOPMPowerStateQueue::init can't alloc lock");
+#endif
     return true;
 }
 
@@ -61,8 +99,13 @@ bool IOPMPowerStateQueue::unIdleOccurred(IOService *inTarget, unsigned long inSt
     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;
@@ -77,8 +120,14 @@ bool IOPMPowerStateQueue::checkForWork()
     UInt16                      theAction;
     
     // Dequeue and process the state change request
+#ifdef __i386__
+    IOLockLock(tmpLock);
+#endif
     if((theNode = (PowerChangeEntry *)OSDequeueAtomic((void **)&changes, 0)))
     {
+#ifdef __i386__
+      IOLockUnlock(tmpLock);
+#endif
         theState = theNode->state;
         theTarget = theNode->target;
         theAction = theNode->actionType;
@@ -87,11 +136,15 @@ bool IOPMPowerStateQueue::checkForWork()
         switch (theAction)
         {
             case kUnIdle:
-                theTarget->command_received(theState, 0, 0, 0);
+                theTarget->command_received((void *)theState, 0, 0, 0);
                 break;
         }
     }
-
+#ifdef __i386__
+    else {
+      IOLockUnlock(tmpLock);
+    }
+#endif
     // Return true if there's more work to be done
     if(changes) return true;
     else return false;