xnu-344.23.tar.gz

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

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index c7f5e05e8655286d8c39e9de1bae63fe83420c33..6a5f344f22146954a9fa20862b3c67ea3d147115 100644 (file)
--- a/iokit/IOKit/IOTypes.h
+++ b/iokit/IOKit/IOTypes.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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 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
+ * 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.
+ * 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@
  */
@@ -171,21 +168,19 @@ enum {
     kIODefaultCache            = 0,
     kIOInhibitCache            = 1,
     kIOWriteThruCache          = 2,
-    kIOCopybackCache           = 3,
-    kIOWriteCombineCache       = 4
+    kIOCopybackCache           = 3
 };
 
 // IOMemory mapping options
 enum {
     kIOMapAnywhere             = 0x00000001,
 
-    kIOMapCacheMask            = 0x00000700,
+    kIOMapCacheMask            = 0x00000300,
     kIOMapCacheShift           = 8,
-    kIOMapDefaultCache         = kIODefaultCache      << kIOMapCacheShift,
-    kIOMapInhibitCache         = kIOInhibitCache      << kIOMapCacheShift,
-    kIOMapWriteThruCache       = kIOWriteThruCache    << kIOMapCacheShift,
-    kIOMapCopybackCache                = kIOCopybackCache     << kIOMapCacheShift,
-    kIOMapWriteCombineCache    = kIOWriteCombineCache << kIOMapCacheShift,
+    kIOMapDefaultCache         = kIODefaultCache   << kIOMapCacheShift,
+    kIOMapInhibitCache         = kIOInhibitCache   << kIOMapCacheShift,
+    kIOMapWriteThruCache       = kIOWriteThruCache << kIOMapCacheShift,
+    kIOMapCopybackCache                = kIOCopybackCache  << kIOMapCacheShift,
 
     kIOMapUserOptionsMask      = 0x00000fff,