X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..2dced7af2b695f87fe26496a3e73c219b7880cbc:/osfmk/mach/memory_object_control.defs

diff --git a/osfmk/mach/memory_object_control.defs b/osfmk/mach/memory_object_control.defs
index b174f03fa..e13d85b0e 100644
--- a/osfmk/mach/memory_object_control.defs
+++ b/osfmk/mach/memory_object_control.defs
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 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@
@@ -62,16 +65,12 @@
 subsystem
 #if	KERNEL_USER
 	  KernelUser
-#endif	KERNEL_USER
+#endif	/* KERNEL_USER */
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		     memory_object_control 2000;
 
-#ifdef	MACH_KERNEL
-#include <advisory_pageout.h>
-#endif	/* MACH_KERNEL */
-
 #include <mach/std_types.defs>
 #include <mach/mach_types.defs>
 
@@ -94,7 +93,7 @@ routine memory_object_change_attributes(
 routine memory_object_synchronize_completed (
 		memory_control	: memory_object_control_t;
 		offset		: memory_object_offset_t;
-		length		: vm_offset_t);
+		length		: memory_object_size_t);
 
 /*
  *	Control use of the data associated with the given
@@ -117,6 +116,8 @@ routine memory_object_lock_request(
 		memory_control	: memory_object_control_t;
 		offset		: memory_object_offset_t;
 		size		: memory_object_size_t;
+	out	resid_offset	: memory_object_offset_t;
+	out	io_errno	: integer_t;
 		should_return	: memory_object_return_t;
 		flags		: integer_t;
 		lock_value	: vm_prot_t
@@ -143,7 +144,7 @@ routine memory_object_destroy(
 routine memory_object_upl_request(
 		memory_control	: memory_object_control_t;
 	in	offset		: memory_object_offset_t;
-	in	size		: vm_size_t;
+	in	size		: upl_size_t;
 	out	upl		: upl_t;
 	out	page_list	: upl_page_info_array_t, CountInOut;
 	in	cntrl_flags	: integer_t);
@@ -151,12 +152,20 @@ routine memory_object_upl_request(
 routine memory_object_super_upl_request(
 		memory_control		: memory_object_control_t;
 	in	offset		: memory_object_offset_t;
-	in	size		: vm_size_t;
-	in	super_size	: vm_size_t;
+	in	size		: upl_size_t;
+	in	super_size	: upl_size_t;
 	out	upl		: upl_t;
 	out	page_list	: upl_page_info_array_t, CountInOut;
 	in	cntrl_flags	: integer_t);
 
+
+routine memory_object_cluster_size(
+		control		: memory_object_control_t;
+	out	start		: memory_object_offset_t;
+	out	length		: vm_size_t;
+	out	io_streaming	: uint32_t;
+	in	fault_info	: memory_object_fault_info_t);
+
 /*
  * This functions allows a single page to be manipulated with less overhead
  * than creating a UPL.
@@ -165,7 +174,7 @@ routine memory_object_page_op(
 		memory_control	: memory_object_control_t;
 	in	offset		: memory_object_offset_t;
 	in	ops		: integer_t;
-	out	phys_entry	: vm_offset_t;
+	out	phys_entry	: uint32_t;
 	out	flags		: integer_t);
 
 routine memory_object_recover_named(
@@ -176,5 +185,11 @@ routine memory_object_release_name(
 		memory_control	: memory_object_control_t;
 		flags		: integer_t);
 
+routine memory_object_range_op(
+		memory_control	: memory_object_control_t;
+	in	offset_beg	: memory_object_offset_t;
+	in	offset_end	: memory_object_offset_t;
+	in      ops             : integer_t;
+	out     range		: integer_t);
 
-
+/* vim: set ft=c : */