X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..008676633c2ad2c325837c2b64915f7ded690a8f:/iokit/IOKit/IOTypes.h

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index 0dd2dc1ce..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
@@ -75,47 +69,60 @@ typedef UInt32		IOVersion;
 typedef UInt32		IOItemCount;
 typedef UInt32  	IOCacheMode;
 
-typedef UInt32	 	IOByteCount;
+typedef UInt32	 	IOByteCount32;
+typedef UInt64	 	IOByteCount64;
+
+typedef UInt32	IOPhysicalAddress32;
+typedef UInt64	IOPhysicalAddress64;
+typedef UInt32	IOPhysicalLength32;
+typedef UInt64	IOPhysicalLength64;
+
+#if !defined(__arm__) && !defined(__i386__)
+typedef mach_vm_address_t	IOVirtualAddress;
+#else
+typedef vm_address_t		IOVirtualAddress;
+#endif
+
+#if !defined(__arm__) && !defined(__i386__) && !(defined(__x86_64__) && !defined(KERNEL))
+typedef IOByteCount64		IOByteCount;
+#else
+typedef IOByteCount32	 	IOByteCount;
+#endif
 
-  /* LP64todo - these will need to expand to mach_vm_address_t */
-typedef vm_address_t	 IOVirtualAddress;
-typedef IOVirtualAddress IOLogicalAddress;
+typedef IOVirtualAddress    IOLogicalAddress;
 
-#if 0
+#if !defined(__arm__) && !defined(__i386__) && !(defined(__x86_64__) && !defined(KERNEL))
 
-typedef UInt64	IOPhysicalAddress;
-typedef UInt64	IOPhysicalLength;
+typedef IOPhysicalAddress64	 IOPhysicalAddress;
+typedef IOPhysicalLength64	 IOPhysicalLength;
 #define IOPhysical32( hi, lo )		((UInt64) lo + ((UInt64)(hi) << 32))
 #define IOPhysSize	64
 
 #else
 
-typedef UInt32	IOPhysicalAddress;
-typedef UInt32	IOPhysicalLength;
+typedef IOPhysicalAddress32	 IOPhysicalAddress;
+typedef IOPhysicalLength32	 IOPhysicalLength;
 #define IOPhysical32( hi, lo )		(lo)
 #define IOPhysSize	32
 
 #endif
 
 
-#if __cplusplus
-struct IOVirtualRange
+typedef struct
 {
-    IOVirtualAddress	address;
+    IOPhysicalAddress	address;
     IOByteCount		length;
-};
-struct IOAddressRange
-{
-    mach_vm_address_t	address;
-    mach_vm_size_t	length;
-};
-#else
+} IOPhysicalRange;
+
 typedef struct 
 {
     IOVirtualAddress	address;
     IOByteCount		length;
 } IOVirtualRange;
 
+#if !defined(__arm__) && !defined(__i386__)
+typedef IOVirtualRange	IOAddressRange;
+#else
 typedef struct 
 {
     mach_vm_address_t	address;
@@ -151,7 +158,12 @@ typedef unsigned int	IOAlignment;
 #ifndef __IOKIT_PORTS_DEFINED__
 #define __IOKIT_PORTS_DEFINED__
 #ifdef KERNEL
+#ifdef __cplusplus
+class OSObject;
+typedef OSObject * io_object_t;
+#else
 typedef struct OSObject * io_object_t;
+#endif
 #else /* KERNEL */
 typedef mach_port_t	io_object_t;
 #endif /* KERNEL */
@@ -179,7 +191,8 @@ enum {
     kIOInhibitCache		= 1,
     kIOWriteThruCache		= 2,
     kIOCopybackCache		= 3,
-    kIOWriteCombineCache	= 4
+    kIOWriteCombineCache	= 4,
+    kIOCopybackInnerCache	= 5
 };
 
 // IOMemory mapping options
@@ -188,11 +201,12 @@ enum {
 
     kIOMapCacheMask		= 0x00000700,
     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,
+    kIOMapWriteCombineCache	= kIOWriteCombineCache  << kIOMapCacheShift,
+    kIOMapCopybackInnerCache	= kIOCopybackInnerCache << kIOMapCacheShift,
 
     kIOMapUserOptionsMask	= 0x00000fff,
 
@@ -201,7 +215,11 @@ enum {
     kIOMapStatic		= 0x01000000,
     kIOMapReference		= 0x02000000,
     kIOMapUnique		= 0x04000000,
-    kIOMap64Bit			= 0x08000000
+#ifdef XNU_KERNEL_PRIVATE
+    kIOMap64Bit			= 0x08000000,
+#endif
+    kIOMapPrefault		= 0x10000000,
+    kIOMapOverwrite     = 0x20000000
 };
 
 /*! @enum Scale Factors
@@ -220,21 +238,15 @@ enum {
     kTickScale        = (kSecondScale / 100)
 };
 
+enum {
+    kIOConnectMethodVarOutputSize = -3
+};
+
 /* compatibility types */
 
 #ifndef KERNEL
-/*
- * Machine-independent caching specification.
- */
-typedef enum {
-        IO_CacheOff,                    // cache inhibit
-        IO_WriteThrough,
-        IO_CopyBack
-} IOCache;
 
-//typedef char OSString[64];
 typedef unsigned int IODeviceNumber;
-typedef unsigned int IOObjectNumber;
 
 #endif