xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / mach / exc.defs

diff --git a/osfmk/mach/exc.defs b/osfmk/mach/exc.defs
index 1725d29f8b3a2cae8ce3f51507540091922a797a..734e7408fea00b96523a9348aa38195ef823a09e 100644 (file)
--- a/osfmk/mach/exc.defs
+++ b/osfmk/mach/exc.defs
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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@
@@ -56,6 +61,10 @@
  */
 
 subsystem
+#if    KERNEL_SERVER
+         KernelServer
+#endif /* KERNEL_SERVER */
+
 #if    KERNEL_USER
          KernelUser
 #endif
@@ -70,44 +79,55 @@ type exception_data_t               = array[*:2] of integer_t;
 type exception_type_t          = int;
 
 routine                exception_raise(
-#if    KERNEL_USER
-                       exception_port  : mach_port_move_send_t;
-                       thread          : mach_port_move_send_t;
-                       task            : mach_port_move_send_t;
-#else  /* KERNEL_USER */
                        exception_port  : mach_port_t;
                        thread          : mach_port_t;
                        task            : mach_port_t;
-#endif /* KERNEL_USER */
                        exception       : exception_type_t;
                        code            : exception_data_t
+#if EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken : security_token_t
+#endif
+#if EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
                        );
 
 routine                exception_raise_state(
-#if    KERNEL_USER
-                       exception_port  : mach_port_move_send_t;
-#else  /* KERNEL_USER */
                        exception_port  : mach_port_t;
-#endif /* KERNEL_USER */
                        exception       : exception_type_t;
                        code            : exception_data_t, const;
                  inout flavor          : int;
                        old_state       : thread_state_t, const;
-                   out new_state       : thread_state_t);
+                   out new_state       : thread_state_t
+#if EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken : security_token_t
+#endif
+#if EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
+                       );
 
 routine                exception_raise_state_identity(
-#if    KERNEL_USER
-                       exception_port  : mach_port_move_send_t;
-                       thread          : mach_port_move_send_t;
-                       task            : mach_port_move_send_t;
-#else  /* KERNEL_USER */
                        exception_port  : mach_port_t;
                        thread          : mach_port_t;
                        task            : mach_port_t;
-#endif /* KERNEL_USER */
                        exception       : exception_type_t;
                        code            : exception_data_t;
                  inout flavor          : int;
                        old_state       : thread_state_t;
-                   out new_state       : thread_state_t);
+                   out new_state       : thread_state_t
+#if EXC_SERVER_SECTOKEN
+ ;
+ ServerSecToken stoken : security_token_t
+#endif
+#if EXC_SERVER_AUDITTOKEN
+ ;
+ ServerAuditToken atoken: audit_token_t
+#endif
+                       );
 
+/* vim: set ft=c : */