xnu-7195.101.1.tar.gz

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

diff --git a/osfmk/ipc/ipc_kmsg.h b/osfmk/ipc/ipc_kmsg.h
index dff4370cf010d78f6dc7ae767b4317b6a43bbeeb..fe744639f77816cbc35f0295f619b503aa62ed72 100644 (file)
--- a/osfmk/ipc/ipc_kmsg.h
+++ b/osfmk/ipc/ipc_kmsg.h
@@ -82,10 +82,6 @@
 #include <ipc/ipc_object.h>
 #include <sys/kdebug.h>
 
-typedef uint16_t ipc_kmsg_flags_t;
-
-#define IPC_KMSG_FLAGS_ALLOW_IMMOVABLE_SEND 0x1       /* Dest port contains an immovable send right */
-
 #if (DEVELOPMENT || DEBUG)
 /* Turn on to keep partial message signatures for better debug */
 #define IKM_PARTIAL_SIG        0
@@ -107,8 +103,6 @@ typedef uint16_t ipc_kmsg_flags_t;
  */
 
 struct ipc_kmsg {
-       mach_msg_size_t            ikm_size;
-       uint32_t                   ikm_ppriority;    /* pthread priority of this kmsg */
        struct ipc_kmsg            *ikm_next;        /* next message on port/discard queue */
        struct ipc_kmsg            *ikm_prev;        /* prev message on port/discard queue */
        union {
@@ -123,12 +117,14 @@ struct ipc_kmsg {
 #if MACH_FLIPC
        struct mach_node           *ikm_node;        /* Originating node - needed for ack */
 #endif
+       mach_msg_size_t            ikm_size;
+       uint32_t                   ikm_ppriority;    /* pthread priority of this kmsg */
 #if IKM_PARTIAL_SIG
        uintptr_t                  ikm_header_sig;   /* sig for just the header */
        uintptr_t                  ikm_headtrail_sig;/* sif for header and trailer */
 #endif
        uintptr_t                  ikm_signature;    /* sig for all kernel-processed data */
-       ipc_kmsg_flags_t           ikm_flags;
+       ipc_object_copyin_flags_t  ikm_flags;
        mach_msg_qos_t             ikm_qos_override; /* qos override on this kmsg */
        mach_msg_filter_id         ikm_filter_policy_id; /* Sandbox-specific policy id used for message filtering */
 };
@@ -334,15 +330,6 @@ extern mach_msg_return_t ipc_kmsg_copyout_header(
        ipc_space_t             space,
        mach_msg_option_t       option);
 
-/* Copyout a port right returning a name */
-extern mach_msg_return_t ipc_kmsg_copyout_object(
-       ipc_space_t             space,
-       ipc_object_t            object,
-       mach_msg_type_name_t    msgt_name,
-       mach_port_context_t     *context,
-       mach_msg_guard_flags_t  *guard_flags,
-       mach_port_name_t        *namep);
-
 /* Copyout the header and body to a user message */
 extern mach_msg_return_t ipc_kmsg_copyout(
        ipc_kmsg_t              kmsg,