X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..d1ecb069dfe24481e4a83f44cb5217a2b06746d7:/iokit/IOKit/IOTypes.h

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index d503e6a47..9f5d5a3f7 100644
--- a/iokit/IOKit/IOTypes.h
+++ b/iokit/IOKit/IOTypes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,13 +25,6 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
 #ifndef	__IOKIT_IOTYPES_H
 #define __IOKIT_IOTYPES_H
 
@@ -53,7 +46,11 @@ extern "C" {
 #endif
 
 #ifndef	NULL
+#if defined (__cplusplus)
 #define	NULL	0
+#else
+#define NULL ((void *)0)
+#endif
 #endif
 	
 /*
@@ -62,64 +59,82 @@ extern "C" {
 #ifndef __MACTYPES__	/* CF MacTypes.h */
 #ifndef __TYPES__	/* guess... Mac Types.h */
 
+#include <stdbool.h>
 #include <libkern/OSTypes.h>
 
-#ifndef __cplusplus
-#if !TYPE_BOOL
-#ifdef KERNEL
-typedef int	bool;
-enum {
-    false	= 0,
-    true	= 1
-};
-#endif
-#endif
-#endif
-
 #endif /* __TYPES__ */
 #endif /* __MACTYPES__ */
 
+#if KERNEL
+#include <libkern/OSBase.h>
+#endif
+
 typedef UInt32		IOOptionBits;
 typedef SInt32		IOFixed;
 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;
 
-  /* LP64todo - these will need to expand to mach_vm_address_t */
-typedef vm_address_t	 IOVirtualAddress;
-typedef IOVirtualAddress IOLogicalAddress;
+#ifdef __LP64__
+typedef mach_vm_address_t	IOVirtualAddress;
+#else
+typedef vm_address_t		IOVirtualAddress;
+#endif
+
+#if defined(__LP64__) && defined(KERNEL)
+typedef IOByteCount64		IOByteCount;
+#else
+typedef IOByteCount32	 	IOByteCount;
+#endif
 
-#if 0
+typedef IOVirtualAddress    IOLogicalAddress;
 
-typedef UInt64	IOPhysicalAddress;
-typedef UInt64	IOPhysicalLength;
+#if defined(__LP64__) && defined(KERNEL)
+
+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;
-};
-#else
+} IOPhysicalRange;
+
 typedef struct 
 {
     IOVirtualAddress	address;
     IOByteCount		length;
 } IOVirtualRange;
-#endif
+
+#ifdef __LP64__
+typedef IOVirtualRange	IOAddressRange;
+#else /* !__LP64__ */
+typedef struct 
+{
+    mach_vm_address_t	address;
+    mach_vm_size_t	length;
+} IOAddressRange;
+#endif /* !__LP64__ */
 
 /*
  * Map between #defined or enum'd constants and text description.
@@ -199,6 +214,9 @@ enum {
     kIOMapStatic		= 0x01000000,
     kIOMapReference		= 0x02000000,
     kIOMapUnique		= 0x04000000
+#ifdef XNU_KERNEL_PRIVATE
+    , kIOMap64Bit		= 0x08000000
+#endif
 };
 
 /*! @enum Scale Factors
@@ -220,18 +238,8 @@ enum {
 /* 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