xnu-1228.0.2.tar.gz

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

diff --git a/osfmk/mach/memory_object.defs b/osfmk/mach/memory_object.defs
index 742e708ca6896d142182b0fff14681af29ac5a8f..9fd7664f4601d57de7e49da297eaf7d715bf12ce 100644 (file)
--- a/osfmk/mach/memory_object.defs
+++ b/osfmk/mach/memory_object.defs
@@ -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@
@@ -92,7 +95,7 @@ serverprefix dp_;
 routine        memory_object_init(
                memory_object           : memory_object_t;
                memory_control  : memory_object_control_t;
-               memory_object_page_size : vm_size_t);
+               memory_object_page_size : memory_object_cluster_size_t);
 
 
 /*
@@ -119,8 +122,9 @@ routine     memory_object_terminate(
 routine        memory_object_data_request(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               length                  : vm_size_t;
-               desired_access          : vm_prot_t);
+               length                  : memory_object_cluster_size_t;
+               desired_access          : vm_prot_t;
+               fault_info              : memory_object_fault_info_t);
 
 /*
  *     Return data to manager.  This call is used in place of data_write
@@ -136,9 +140,12 @@ routine    memory_object_data_request(
 routine   memory_object_data_return(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               size                    : vm_size_t;
+               size                    : memory_object_cluster_size_t;
+       out     resid_offset            : memory_object_offset_t;
+       out     io_error                : int;
                dirty                   : boolean_t;
-               kernel_copy             : boolean_t);
+               kernel_copy             : boolean_t;
+               upl_flags               : int);
 
 /*
  *     Provide initial data contents for this region of
@@ -151,7 +158,7 @@ routine   memory_object_data_return(
 routine        memory_object_data_initialize(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               size                    : vm_size_t);
+               size                    : memory_object_cluster_size_t);
 
 /*
  *     Request that the specified portion of this
@@ -164,7 +171,7 @@ routine     memory_object_data_initialize(
 routine        memory_object_data_unlock(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               size                    : vm_size_t;
+               size                    : memory_object_cluster_size_t;
                desired_access          : vm_prot_t);
 
 
@@ -179,7 +186,7 @@ routine     memory_object_data_unlock(
 routine memory_object_synchronize(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               size                    : vm_size_t;
+               size                    : memory_object_cluster_size_t;
                sync_flags              : vm_sync_t );
 
 /*
@@ -193,4 +200,4 @@ routine memory_object_synchronize(
 routine memory_object_unmap(
                memory_object           : memory_object_t);
 
-
+/* vim: set ft=c : */