xnu-344.tar.gz

[apple/xnu.git] / osfmk / mach / port.h

diff --git a/osfmk/mach/port.h b/osfmk/mach/port.h
index 42c182000b04b48f107d8cf0a3b3378444551a10..df7d75142ced79a00455b641b5d3b96467ab6742 100644 (file)
--- a/osfmk/mach/port.h
+++ b/osfmk/mach/port.h
@@ -61,9 +61,12 @@
 #ifndef        _MACH_PORT_H_
 #define _MACH_PORT_H_
 
 #ifndef        _MACH_PORT_H_
 #define _MACH_PORT_H_
 

+#include <stdint.h>

 #include <mach/boolean.h>
 #include <mach/machine/vm_types.h>
 
 #include <mach/boolean.h>
 #include <mach/machine/vm_types.h>
 

+#include <sys/appleapiopts.h>
+

 /*
  * A port_name_t is a 32 bit value which represents a name of a
  * port right within some ipc space.  This is a constant definition
 /*
  * A port_name_t is a 32 bit value which represents a name of a
  * port right within some ipc space.  This is a constant definition


@@ -80,18 +83,38 @@
  *     are naked rights) these rights are represented by passing a
  *     pointer to the specific ipc_object_t subclass (typically
  *     ipc_port_t) that got altered/is to be altered.
  *     are naked rights) these rights are represented by passing a
  *     pointer to the specific ipc_object_t subclass (typically
  *     ipc_port_t) that got altered/is to be altered.

+ *
+ *     JMM - Because of this pointer/integer overloading, port names
+ *     should be defined as uintptr_t types.  But that would make
+ *     message headers and descriptors pointer-length dependent.

  */
 typedef natural_t port_name_t;
 typedef port_name_t *port_name_array_t;
 
 #ifdef KERNEL_PRIVATE
 
  */
 typedef natural_t port_name_t;
 typedef port_name_t *port_name_array_t;
 
 #ifdef KERNEL_PRIVATE
 

-#include <ipc/ipc_types.h>
-typedef ipc_port_t port_t;
+#if !defined(__APPLE_API_PRIVATE) || !defined(MACH_KERNEL_PRIVATE)
+/*
+ * For kernel code that resides outside of mach
+ * we define empty structs so that everything will
+ * remain strongly typed, without giving out
+ * implementation details.
+ */
+struct ipc_port ;
+
+#endif /* !__APPLE_API_PRIVATE || !MACH_KERNEL_PRIVATE */
+
+typedef struct ipc_port                *ipc_port_t;
+typedef ipc_port_t             port_t;
+
+#define        IPC_PORT_NULL           ((ipc_port_t) 0)
+#define        IPC_PORT_DEAD           ((ipc_port_t)~0)
+#define IPC_PORT_VALID(port)   (((port) != IPC_PORT_NULL) && \
+                                ((port) != IPC_PORT_DEAD))

 
 #else  /* ! KERNEL_PRIVATE */
 
 
 #else  /* ! KERNEL_PRIVATE */
 

-typedef port_name_t port_t;
+typedef port_name_t            port_t;

 
 #endif /* KERNEL_PRIVATE */
 
 
 #endif /* KERNEL_PRIVATE */
 


@@ -214,16 +237,10 @@ typedef natural_t mach_port_msgcount_t;           /* number of msgs */
 typedef natural_t mach_port_rights_t;          /* number of rights */
 
 /*
 typedef natural_t mach_port_rights_t;          /* number of rights */
 
 /*

- *     A port may have NMS detection enabled, in which case
- *     it tracks outstanding send rights.  Otherwise, there
- *     is no information available about outstanding srights.
- *     The return values are deliberately chosen to match
- *     the old boolean (0=FALSE=no srights, 1=TRUE=srights,
- *     2=xxx=no information available).
+ *     Are there outstanding send rights for a given port?

  */
  */

-#define        MACH_PORT_SRIGHTS_NONE          0               /* NMS:  no srights */
-#define        MACH_PORT_SRIGHTS_PRESENT       1               /* NMS:  srights */
-#define        MACH_PORT_SRIGHTS_NO_INFO       2               /* no NMS */
+#define        MACH_PORT_SRIGHTS_NONE          0               /* no srights */
+#define        MACH_PORT_SRIGHTS_PRESENT       1               /* srights */

 typedef unsigned int mach_port_srights_t;      /* status of send rights */
 
 typedef struct mach_port_status {
 typedef unsigned int mach_port_srights_t;      /* status of send rights */
 
 typedef struct mach_port_status {