xnu-1228.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_entry.h

diff --git a/osfmk/ipc/ipc_entry.h b/osfmk/ipc/ipc_entry.h
index daf5ee4fbce04effc562e222a4b25c3bb28ef4fb..e1c01d15468bc6e8540da19f29129a6cd687eaa4 100644 (file)
--- a/osfmk/ipc/ipc_entry.h
+++ b/osfmk/ipc/ipc_entry.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -64,11 +67,13 @@
 #ifndef        _IPC_IPC_ENTRY_H_
 #define _IPC_IPC_ENTRY_H_
 
+#include <mach/mach_types.h>
 #include <mach/port.h>
 #include <mach/kern_return.h>
+
+#include <kern/kern_types.h>
 #include <kern/zalloc.h>
-#include <ipc/port.h>
-#include <ipc/ipc_table.h>
+
 #include <ipc/ipc_types.h>
 
 /*
@@ -92,10 +97,7 @@
  *     It is used as the head of the free list.
  */
 
-typedef natural_t ipc_entry_bits_t;
-typedef ipc_table_elems_t ipc_entry_num_t;     /* number of entries */
-
-typedef struct ipc_entry {
+struct ipc_entry {
        struct ipc_object *ie_object;
        ipc_entry_bits_t ie_bits;
        union {
@@ -106,9 +108,7 @@ typedef struct ipc_entry {
                mach_port_index_t table;
                struct ipc_tree_entry *tree;
        } hash;
-} *ipc_entry_t;
-
-#define        IE_NULL         ((ipc_entry_t) 0)
+};
 
 #define        ie_request      index.request
 #define        ie_next         index.next
@@ -138,15 +138,13 @@ typedef struct ipc_entry {
 
 #define        IE_BITS_RIGHT_MASK      0x007fffff      /* relevant to the right */
 
-typedef struct ipc_tree_entry {
+struct ipc_tree_entry {
        struct ipc_entry ite_entry;
        mach_port_name_t ite_name;
        struct ipc_space *ite_space;
        struct ipc_tree_entry *ite_lchild;
        struct ipc_tree_entry *ite_rchild;
-} *ipc_tree_entry_t;
-
-#define        ITE_NULL        ((ipc_tree_entry_t) 0)
+};
 
 #define        ite_bits        ite_entry.ie_bits
 #define        ite_object      ite_entry.ie_object
@@ -156,7 +154,7 @@ typedef struct ipc_tree_entry {
 extern zone_t ipc_tree_entry_zone;
 
 #define ite_alloc()    ((ipc_tree_entry_t) zalloc(ipc_tree_entry_zone))
-#define        ite_free(ite)   zfree(ipc_tree_entry_zone, (vm_offset_t) (ite))
+#define        ite_free(ite)   zfree(ipc_tree_entry_zone, (ite))
 
 /*
  * Exported interfaces
@@ -193,7 +191,7 @@ extern void ipc_entry_dealloc(
 
 /* Grow the table in a space */
 extern kern_return_t ipc_entry_grow_table(
-       ipc_space_t     space,
-       int             target_size);
+       ipc_space_t             space,
+       ipc_table_elems_t       target_size);
 
 #endif /* _IPC_IPC_ENTRY_H_ */