X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/316670eb35587141e969394ae8537d66b9211e80..ecc0ceb4089d506a0b8d16686a95817b331af9cb:/iokit/IOKit/IOTypes.h

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index 76bd0acfa..6d21a1294 100644
--- a/iokit/IOKit/IOTypes.h
+++ b/iokit/IOKit/IOTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2012 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -56,15 +56,9 @@ extern "C" {
 /*
  * Simple data types.
  */
-#ifndef __MACTYPES__	/* CF MacTypes.h */
-#ifndef __TYPES__	/* guess... Mac Types.h */
-
 #include <stdbool.h>
 #include <libkern/OSTypes.h>
 
-#endif /* __TYPES__ */
-#endif /* __MACTYPES__ */
-
 #if KERNEL
 #include <libkern/OSBase.h>
 #endif
@@ -83,13 +77,13 @@ typedef UInt64	IOPhysicalAddress64;
 typedef UInt32	IOPhysicalLength32;
 typedef UInt64	IOPhysicalLength64;
 
-#ifdef __LP64__
+#if !defined(__arm__) && !defined(__i386__)
 typedef mach_vm_address_t	IOVirtualAddress;
 #else
 typedef vm_address_t		IOVirtualAddress;
 #endif
 
-#if defined(__LP64__) && defined(KERNEL)
+#if !defined(__arm__) && !defined(__i386__) && !(defined(__x86_64__) && !defined(KERNEL))
 typedef IOByteCount64		IOByteCount;
 #else
 typedef IOByteCount32	 	IOByteCount;
@@ -97,7 +91,7 @@ typedef IOByteCount32	 	IOByteCount;
 
 typedef IOVirtualAddress    IOLogicalAddress;
 
-#if defined(__LP64__) && defined(KERNEL)
+#if !defined(__arm__) && !defined(__i386__) && !(defined(__x86_64__) && !defined(KERNEL))
 
 typedef IOPhysicalAddress64	 IOPhysicalAddress;
 typedef IOPhysicalLength64	 IOPhysicalLength;
@@ -126,15 +120,15 @@ typedef struct
     IOByteCount		length;
 } IOVirtualRange;
 
-#ifdef __LP64__
+#if !defined(__arm__) && !defined(__i386__)
 typedef IOVirtualRange	IOAddressRange;
-#else /* !__LP64__ */
+#else
 typedef struct 
 {
     mach_vm_address_t	address;
     mach_vm_size_t	length;
 } IOAddressRange;
-#endif /* !__LP64__ */
+#endif
 
 /*
  * Map between #defined or enum'd constants and text description.
@@ -220,10 +214,12 @@ enum {
 
     kIOMapStatic		= 0x01000000,
     kIOMapReference		= 0x02000000,
-    kIOMapUnique		= 0x04000000
+    kIOMapUnique		= 0x04000000,
 #ifdef XNU_KERNEL_PRIVATE
-    , kIOMap64Bit		= 0x08000000
+    kIOMap64Bit			= 0x08000000,
 #endif
+    kIOMapPrefault		= 0x10000000,
+    kIOMapOverwrite     = 0x20000000
 };
 
 /*! @enum Scale Factors