xnu-792.6.61.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 23b942e7991b154c9367a889da248b751e516fb3..920397d640d8e440800e04156acf92e85f39107f 100644 (file)
--- a/osfmk/mach/memory_object.defs
+++ b/osfmk/mach/memory_object.defs
@@ -1,24 +1,21 @@
 /*
- * 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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -62,10 +59,10 @@
 subsystem
 #if    KERNEL_USER
          KernelUser
-#endif KERNEL_USER
+#endif /* KERNEL_USER */
 #if    KERNEL_SERVER
          KernelServer
-#endif KERNEL_SERVER
+#endif /* KERNEL_SERVER */
                     memory_object 2200;
 
 #ifdef MACH_KERNEL
@@ -92,7 +89,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,7 +116,7 @@ routine     memory_object_terminate(
 routine        memory_object_data_request(
                memory_object           : memory_object_t;
                offset                  : memory_object_offset_t;
-               length                  : vm_size_t;
+               length                  : memory_object_cluster_size_t;
                desired_access          : vm_prot_t);
 
 /*
@@ -136,9 +133,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 +151,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 +164,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 +179,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 );
 
 /*