xnu-344.21.74.tar.gz

[apple/xnu.git] / iokit / IOKit / IOCatalogue.h

diff --git a/iokit/IOKit/IOCatalogue.h b/iokit/IOKit/IOCatalogue.h
index 1b72688f477f7d24e253bede353d7ea266f83e57..7905d86db15ffd7935d6856a3d6ec41bf90af549 100644 (file)
--- a/iokit/IOKit/IOCatalogue.h
+++ b/iokit/IOKit/IOCatalogue.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * 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.
+ * 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -56,6 +59,8 @@ private:
     IOLock *                 lock;
     SInt32                   generation;
 
     IOLock *                 lock;
     SInt32                   generation;
 

+    IOLock *                 kld_lock;
+

 public:
     /*!
         @function initialize
 public:
     /*!
         @function initialize


@@ -159,7 +164,7 @@ public:
     /*!
         @function terminateDrivers
         @abstract Terminates all instances of a driver which match the contents of the matching dictionary. Does not unload module.
     /*!
         @function terminateDrivers
         @abstract Terminates all instances of a driver which match the contents of the matching dictionary. Does not unload module.

-        @param matching Dictionary containing the matching criteria.
+        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will cause termination for all instances whose personalities have the key 'IOProviderClass' equal to 'IOPCIDevice'.

      */
     IOReturn terminateDrivers( OSDictionary * matching );
 
      */
     IOReturn terminateDrivers( OSDictionary * matching );
 


@@ -182,7 +187,7 @@ public:
     /*!
         @function startMatching
         @abstract Starts an IOService matching thread where matching keys and values are provided by the matching dictionary.
     /*!
         @function startMatching
         @abstract Starts an IOService matching thread where matching keys and values are provided by the matching dictionary.

-        @param matching A dictionary containing keys and values to match against.
+        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will start matching for all personalities which have the key 'IOProviderClass' equal to 'IOPCIDevice'.

      */
     bool startMatching( OSDictionary * matching );
 
      */
     bool startMatching( OSDictionary * matching );