xnu-792.25.20.tar.gz

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

diff --git a/iokit/Kernel/IOPMWorkArbiter.cpp b/iokit/Kernel/IOPMWorkArbiter.cpp
index 0cfa311f2c969f43b6e01a779686fd8a40f67cd3..060c457f096ffcc84b4eb9a23f425b5e8489cbf5 100644 (file)
--- a/iokit/Kernel/IOPMWorkArbiter.cpp
+++ b/iokit/Kernel/IOPMWorkArbiter.cpp
@@ -1,31 +1,23 @@
 /*
  * Copyright (c) 2001-2002 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2001-2002 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_OSREFERENCE_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 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, 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.
+ * @APPLE_LICENSE_HEADER_START@

  *
  *

- * Please obtain a copy of the License at 
- * http://www.opensource.apple.com/apsl/ and read it before using this 
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource 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, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * 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.
+ * This 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,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  *
  *

- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@

  */
  
 #include "IOPMWorkArbiter.h"
  */
  
 #include "IOPMWorkArbiter.h"


@@ -98,45 +90,6 @@ bool IOPMWorkArbiter::init(OSObject *owner, Action action)
     return true;
 }
 
     return true;
 }
 

-/*************************************************************************/
-bool IOPMWorkArbiter::driverAckedOccurred(IOService *inTarget)
-{
-    PMEventEntry                 *new_one = NULL;
-
-    new_one = (PMEventEntry *)IOMalloc(sizeof(PMEventEntry));
-    if(!new_one) return false;
-    
-    new_one->actionType = IOPMWorkArbiter::kDriverAcked;
-    new_one->target = inTarget;
-    
-    // Change to queue
-    IOLockLock(tmpLock);
-    _enqueue((void **)&events, (void *)new_one, 0);
-    IOLockUnlock(tmpLock);
-    signalWorkAvailable();
-
-    return true;
-}
-
-/*************************************************************************/
-bool IOPMWorkArbiter::allAckedOccurred(IOService *inTarget)  
-{
-    PMEventEntry                 *new_one = NULL;
-
-    new_one = (PMEventEntry *)IOMalloc(sizeof(PMEventEntry));
-    if(!new_one) return false;
-    
-    new_one->actionType = IOPMWorkArbiter::kAllAcked;
-    new_one->target = inTarget;
-    
-    // Change to queue
-    IOLockLock(tmpLock);
-    _enqueue((void **)&events, (void *)new_one, 0);
-    IOLockUnlock(tmpLock);
-    signalWorkAvailable();
-
-    return true;
-}

 
 /*************************************************************************/
 bool IOPMWorkArbiter::clamshellStateChangeOccurred(uint32_t messageValue)
 
 /*************************************************************************/
 bool IOPMWorkArbiter::clamshellStateChangeOccurred(uint32_t messageValue)


@@ -149,6 +102,7 @@ bool IOPMWorkArbiter::clamshellStateChangeOccurred(uint32_t messageValue)
     new_one->actionType = IOPMWorkArbiter::kRootDomainClamshellChanged;
     new_one->target = (IOService *)fRootDomain;
     new_one->intArgument = messageValue;
     new_one->actionType = IOPMWorkArbiter::kRootDomainClamshellChanged;
     new_one->target = (IOService *)fRootDomain;
     new_one->intArgument = messageValue;

+       new_one->target->retain();

     
     IOLockLock(tmpLock);
     _enqueue((void **)&events, (void *)new_one, 0);
     
     IOLockLock(tmpLock);
     _enqueue((void **)&events, (void *)new_one, 0);


@@ -159,33 +113,6 @@ bool IOPMWorkArbiter::clamshellStateChangeOccurred(uint32_t messageValue)
 }
 
 
 }
 
 

-/*************************************************************************/
-void IOPMWorkArbiter::checkForWorkThreadFunc(void *refcon)
-{
-    PMEventEntry                *theNode = (PMEventEntry *)refcon;    
-    IOService                   *theTarget;
-    UInt16                      theAction;
-
-    if(!theNode) return;
-    theTarget = theNode->target;
-    theAction = theNode->actionType;
-    IOFree(theNode, sizeof(PMEventEntry));
-    theNode = NULL;
-
-    switch (theAction)
-    {
-        case kAllAcked:
-            theTarget->all_acked_threaded();
-            break;
-
-        case kDriverAcked:
-            theTarget->driver_acked_threaded();
-            break;
-    }
-
-}
-
-

 /*************************************************************************/
 // checkForWork() is called in a gated context
 bool IOPMWorkArbiter::checkForWork()
 /*************************************************************************/
 // checkForWork() is called in a gated context
 bool IOPMWorkArbiter::checkForWork()


@@ -201,24 +128,19 @@ bool IOPMWorkArbiter::checkForWork()
       IOLockUnlock(tmpLock);
         theTarget = theNode->target;
         theAction = theNode->actionType;
       IOLockUnlock(tmpLock);
         theTarget = theNode->target;
         theAction = theNode->actionType;

-        IOFree((void *)theNode, sizeof(PMEventEntry));

 
         switch (theAction)
         {
 
         switch (theAction)
         {

-            case kAllAcked:
-                theTarget->all_acked_threaded();
-                break;
-
-            case kDriverAcked:
-                theTarget->driver_acked_threaded();
-                break;
-

             case kRootDomainClamshellChanged:
                 theTarget->messageClients(
                                 kIOPMMessageClamshellStateChange, 
                                 (void *)theNode->intArgument);
                 break;
         }
             case kRootDomainClamshellChanged:
                 theTarget->messageClients(
                                 kIOPMMessageClamshellStateChange, 
                                 (void *)theNode->intArgument);
                 break;
         }

+
+               if (theTarget)
+                       theTarget->release();
+        IOFree((void *)theNode, sizeof(PMEventEntry));

     }
     else {
       IOLockUnlock(tmpLock);
     }
     else {
       IOLockUnlock(tmpLock);


@@ -229,87 +151,3 @@ bool IOPMWorkArbiter::checkForWork()
 }
 
 
 }
 
 

-/*************************************************************************/
-
-/*************************************************************************/
-
-/*************************************************************************/
-
-/*************************************************************************/
-/*
-#undef super
-#define super OSObject
-
-PMWorkerThread *PMWorkerThread::workerThread( IOPMWorkArbiter *inArbiter )
-{
-    PMWorkerThread *     inst;
-
-    if( !(inst = new PMWorkerThread) )
-        goto exit;
-    
-    if( !inst->init() )
-        goto exit;
-        
-    inst->arbiter = inArbiter;
-
-    if( !(IOCreateThread((IOThreadFunc) &PMWorkerThread::main, inst)) )
-        goto exit;
-
-    return inst;
-
-exit:
-    if(inst)
-        inst->release();
-
-    return NULL;
-}
-
-void PMWorkerThread::free( void )
-{
-    super::free();
-}
-
-void PMWorkerThread::main( PMWorkerThread * self )
-{
-    PMWorkUnit    *job;
-    IOService     *who;
-
-    do {
-        // Get a new job 
-        
-        IOTakeLock( gJobsLock );
-
-        if( !(job = (PMWorkUnit *) gJobs->copyNextJob()) )
-        {
-            IOUnlock( gJobsLock );
-            semaphore_wait( gJobsSemaphore );
-            IOTakeLock( gJobsLock );
-            
-            job = (PMWorkUnit *) gJobs->copyNextJob();
-        }
-
-        IOUnlock( gJobsLock );
-
-        if(job) 
-        {
-            who = job->who;
-    
-            // Do job 
-            switch(job->type) 
-            {
-                case kMatchNubJob:
-                    if(who)
-                        who->doServiceMatch();
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-    } while( alive );
-
-    self->release();
-}
-
-*/