Loading...
--- xnu/xnu-12377.101.15/iokit/Kernel/IOPMinformeeList.cpp
+++ xnu/xnu-792/iokit/Kernel/IOPMinformeeList.cpp
@@ -1,134 +1,115 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_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.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ 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
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * 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.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * 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_HEADER_END@
*/
#include <IOKit/pwr_mgt/IOPM.h>
#include <IOKit/pwr_mgt/IOPMinformeeList.h>
#include <IOKit/pwr_mgt/IOPMinformee.h>
#define super OSObject
-OSDefineMetaClassAndStructors(IOPMinformeeList, OSObject)
+OSDefineMetaClassAndStructors(IOPMinformeeList,OSObject)
//*********************************************************************************
// init
//
//*********************************************************************************
-void
-IOPMinformeeList::initialize( void )
+void IOPMinformeeList::initialize ( void )
{
- firstItem = NULL;
- length = 0;
-}
-
-//******************************************************************************
-// getSharedRecursiveLock
-//
-//******************************************************************************
-IORecursiveLock *
-IOPMinformeeList::getSharedRecursiveLock( void )
-{
- static IORecursiveLock *sharedListLock = NULL;
-
- /* A running system could have 50-60+ instances of IOPMInformeeList.
- * They'll share this lock, since list insertion and removal is relatively
- * rare, and generally tied to major events like device discovery.
- *
- * getSharedRecursiveLock() is called from IOStartIOKit to initialize
- * the sharedListLock before any IOPMinformeeLists are instantiated.
- *
- * The IOPMinformeeList class will be around for the lifetime of the system,
- * we don't worry about freeing this lock.
- */
-
- if (NULL == sharedListLock) {
- sharedListLock = IORecursiveLockAlloc();
- }
- return sharedListLock;
+ firstItem = NULL;
+ length = 0;
}
//*********************************************************************************
-// appendNewInformee
+// addToList
//
//*********************************************************************************
-IOPMinformee *
-IOPMinformeeList::appendNewInformee( IOService * newObject )
+
+IOReturn IOPMinformeeList::addToList ( IOPMinformee * newInformee )
{
- IOPMinformee * newInformee;
-
- if (!newObject) {
- return NULL;
- }
-
- newInformee = IOPMinformee::withObject(newObject);
-
- if (!newInformee) {
- return NULL;
- }
-
- if (IOPMNoErr == addToList(newInformee)) {
- return newInformee;
- } else {
- newInformee->release();
- return NULL;
- }
+ IOPMinformee * nextInformee;
+ nextInformee = firstItem; // Is new object already in the list?
+ while ( nextInformee != NULL ) {
+ if ( nextInformee->whatObject == newInformee->whatObject ) {
+ return IOPMNoErr; // yes, just return
+ }
+ nextInformee = nextInList(nextInformee);
+ }
+ newInformee->nextInList = firstItem; // add it to list
+ firstItem = newInformee;
+ length += 1;
+ return IOPMNoErr;
}
//*********************************************************************************
-// addToList
-// *OBSOLETE* do not call from outside of this file.
-// Try appendNewInformee() instead
+// firstInList
+//
//*********************************************************************************
-IOReturn
-IOPMinformeeList::addToList( IOPMinformee * newInformee )
+
+IOPMinformee * IOPMinformeeList::firstInList ( void )
{
- IORecursiveLock *listLock = getSharedRecursiveLock();
- IOReturn ret = kIOReturnError;
+ return firstItem;
+}
- if (!listLock) {
- return ret;
- }
+//*********************************************************************************
+// nextInList
+//
+//*********************************************************************************
- IORecursiveLockLock(listLock);
+IOPMinformee * IOPMinformeeList::nextInList ( IOPMinformee * currentItem )
+{
+ if ( currentItem != NULL ) {
+ return (currentItem->nextInList);
+ }
+ return NULL;
+}
- // Is new object already in the list?
- if (findItem(newInformee->whatObject) != NULL) {
- // object is present; just exit
- goto unlock_and_exit;
- }
+//*********************************************************************************
+// numberOfItems
+//
+//*********************************************************************************
- // add it to the front of the list
- newInformee->nextInList = firstItem;
- firstItem = newInformee;
- length++;
- ret = IOPMNoErr;
+unsigned long IOPMinformeeList::numberOfItems ( void )
+{
+ return length;
+}
-unlock_and_exit:
- IORecursiveLockUnlock(listLock);
- return ret;
+//*********************************************************************************
+// findItem
+//
+// Look through the list for the one which points to the object identified
+// by the parameter. Return a pointer to the list item or NULL.
+//*********************************************************************************
+
+IOPMinformee * IOPMinformeeList::findItem ( IOService * driverOrChild )
+{
+ IOPMinformee * nextObject;
+
+ nextObject = firstInList();
+ while ( nextObject != NULL ) {
+ if ( nextObject->whatObject == driverOrChild ) {
+ return nextObject;
+ }
+ nextObject = nextInList(nextObject);
+ }
+ return NULL;
}
@@ -138,104 +119,31 @@
// Find the item in the list, unlink it, and free it.
//*********************************************************************************
-IOReturn
-IOPMinformeeList::removeFromList( IOService * theItem )
+IOReturn IOPMinformeeList::removeFromList ( IOService * theItem )
{
- IOPMinformee * item = firstItem;
- IOPMinformee * temp;
- IORecursiveLock *listLock = getSharedRecursiveLock();
+ IOPMinformee * item = firstItem;
+ IOPMinformee * temp;
- if (NULL == item) {
- return IOPMNoErr;
- }
- if (!listLock) {
- return kIOReturnError;
- }
-
- IORecursiveLockLock( listLock );
-
- if (item->whatObject == theItem) {
- firstItem = item->nextInList;
- length--;
- item->release();
- goto unlock_and_exit;
- }
-
- while (item->nextInList != NULL) {
- if (item->nextInList->whatObject == theItem) {
- temp = item->nextInList;
- item->nextInList = temp->nextInList;
- length--;
- temp->release();
- goto unlock_and_exit;
- }
- item = item->nextInList;
- }
-
-unlock_and_exit:
- IORecursiveLockUnlock(listLock);
- return IOPMNoErr;
+ if ( item != NULL ) {
+ if ( item->whatObject == theItem ) {
+ firstItem = item->nextInList;
+ length--;
+ item->release();
+ return IOPMNoErr;
+ }
+ while ( item->nextInList != NULL ) {
+ if ( item->nextInList->whatObject == theItem ) {
+ temp = item->nextInList;
+ item->nextInList = temp->nextInList;
+ length--;
+ temp->release();
+ return IOPMNoErr;
+ }
+ item = item->nextInList;
+ }
+ }
+ return IOPMNoErr;
}
-
-
-//*********************************************************************************
-// firstInList
-//
-//*********************************************************************************
-
-IOPMinformee *
-IOPMinformeeList::firstInList( void )
-{
- return firstItem;
-}
-
-//*********************************************************************************
-// nextInList
-//
-//*********************************************************************************
-
-IOPMinformee *
-IOPMinformeeList::nextInList( IOPMinformee * currentItem )
-{
- if (currentItem != NULL) {
- return currentItem->nextInList;
- }
- return NULL;
-}
-
-//*********************************************************************************
-// numberOfItems
-//
-//*********************************************************************************
-
-unsigned long
-IOPMinformeeList::numberOfItems( void )
-{
- return length;
-}
-
-//*********************************************************************************
-// findItem
-//
-// Look through the list for the one which points to the object identified
-// by the parameter. Return a pointer to the list item or NULL.
-//*********************************************************************************
-
-IOPMinformee *
-IOPMinformeeList::findItem( IOService * driverOrChild )
-{
- IOPMinformee * nextObject;
-
- nextObject = firstInList();
- while (nextObject != NULL) {
- if (nextObject->whatObject == driverOrChild) {
- return nextObject;
- }
- nextObject = nextInList(nextObject);
- }
- return NULL;
-}
-
//*********************************************************************************
@@ -244,16 +152,16 @@
// Free all items in the list, and then free the list itself
//*********************************************************************************
-void
-IOPMinformeeList::free(void )
+void IOPMinformeeList::free (void )
{
- IOPMinformee * next = firstItem;
+ IOPMinformee * next = firstItem;
- while (next != NULL) {
- firstItem = next->nextInList;
- length--;
- next->release();
- next = firstItem;
- }
- super::free();
+ while ( next != NULL ) {
+ firstItem = next->nextInList;
+ length--;
+ next->release();
+ next = firstItem;
+ }
+super::free();
}
+