xnu-1228.0.2.tar.gz

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

diff --git a/iokit/IOKit/IOTypes.h b/iokit/IOKit/IOTypes.h
index d503e6a4730e64683db54670a90d06e569bd9d89..0dd2dc1ce7ca9cba656af6751e9e5b9b83065d12 100644 (file)
--- 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,23 +59,16 @@ 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;
@@ -107,18 +97,30 @@ typedef UInt32     IOPhysicalLength;
 
 #endif
 
+
 #if __cplusplus
 struct IOVirtualRange
 {
     IOVirtualAddress   address;
     IOByteCount                length;
 };
+struct IOAddressRange
+{
+    mach_vm_address_t  address;
+    mach_vm_size_t     length;
+};
 #else
 typedef struct 
 {
     IOVirtualAddress   address;
     IOByteCount                length;
 } IOVirtualRange;
+
+typedef struct 
+{
+    mach_vm_address_t  address;
+    mach_vm_size_t     length;
+} IOAddressRange;
 #endif
 
 /*
@@ -198,7 +200,8 @@ enum {
 
     kIOMapStatic               = 0x01000000,
     kIOMapReference            = 0x02000000,
-    kIOMapUnique               = 0x04000000
+    kIOMapUnique               = 0x04000000,
+    kIOMap64Bit                        = 0x08000000
 };
 
 /*! @enum Scale Factors