xnu-2782.20.48.tar.gz

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

diff --git a/iokit/Kernel/IOPMPowerStateQueue.cpp b/iokit/Kernel/IOPMPowerStateQueue.cpp
index 3aca81e51c13eea265be35d708f67a5194f3b951..cd24b8c539c722e51e8ed2b5b26c24baebb043e6 100644 (file)
--- a/iokit/Kernel/IOPMPowerStateQueue.cpp
+++ b/iokit/Kernel/IOPMPowerStateQueue.cpp
@@ -27,15 +27,16 @@
  */
  
 #include "IOPMPowerStateQueue.h"
  */
  
 #include "IOPMPowerStateQueue.h"

-#undef super
+

 #define super IOEventSource
 #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) )
+    if (me && !me->init(inOwner, inAction))

     {
         me->release();
         return NULL;
     {
         me->release();
         return NULL;


@@ -44,61 +45,60 @@ IOPMPowerStateQueue *IOPMPowerStateQueue::PMPowerStateQueue(OSObject *inOwner)
     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_init( &queueHead );

 
 

-    // Queue of powerstate changes
-    changes = NULL;
+    queueLock = IOLockAlloc();
+    if (!queueLock)
+        return false;

 
     return true;
 }
 
 
     return true;
 }
 

-
-bool IOPMPowerStateQueue::unIdleOccurred(IOService *inTarget, unsigned long inState)
+bool IOPMPowerStateQueue::submitPowerEvent(
+     uint32_t eventType,
+     void *   arg0,
+     uint64_t arg1 )

 {
 {

-    PowerChangeEntry             *new_one = NULL;
-
-    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);
-    
+    PowerEventEntry * entry;
+
+    entry = IONew(PowerEventEntry, 1);
+    if (!entry)
+        return false;
+
+    entry->eventType = eventType;
+    entry->arg0 = arg0;
+    entry->arg1 = arg1;
+
+    IOLockLock(queueLock);
+    queue_enter(&queueHead, entry, PowerEventEntry *, chain);
+    IOLockUnlock(queueLock);

     signalWorkAvailable();
 
     return true;
 }
 
     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;
+
+       IOLockLock(queueLock);
+       while (!queue_empty(&queueHead))
+       {
+               queue_remove_first(&queueHead, entry, PowerEventEntry *, chain);                
+               IOLockUnlock(queueLock);
+
+        (*queueAction)(owner, entry->eventType, entry->arg0, entry->arg1);        
+        IODelete(entry, PowerEventEntry, 1);
+
+        IOLockLock(queueLock);
+       }
+       IOLockUnlock(queueLock);

 
 

-    // Return true if there's more work to be done
-    if(changes) return true;
-    else return false;
+    return false;

 }
 }