X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..0b4c1975fb5e4eccf1012a35081f7e7799b81046:/osfmk/vm/device_vm.c

diff --git a/osfmk/vm/device_vm.c b/osfmk/vm/device_vm.c
index 4fe6ef023..575351078 100644
--- a/osfmk/vm/device_vm.c
+++ b/osfmk/vm/device_vm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -73,18 +73,19 @@ const struct memory_object_pager_ops device_pager_ops = {
 	device_pager_data_initialize,
 	device_pager_data_unlock,
 	device_pager_synchronize,
-	device_pager_unmap,
+	device_pager_map,
+	device_pager_last_unmap,
 	"device pager"
 };
 
-typedef int device_port_t;
+typedef uintptr_t device_port_t;
 
 /*
  * The start of "struct device_pager" MUST match a "struct memory_object".
  */
 typedef struct device_pager {
+	struct ipc_object_header	pager_header;	/* fake ip_kotype()	*/
 	memory_object_pager_ops_t pager_ops; /* == &device_pager_ops	*/
-	unsigned int	pager_ikot;	/* fake ip_kotype() 		*/
 	unsigned int	ref_count;	/* reference count		*/
 	memory_object_control_t	control_handle;	/* mem object's cntrl handle */
 	device_port_t   device_handle;  /* device_handle */
@@ -92,7 +93,7 @@ typedef struct device_pager {
 	int		flags;
 } *device_pager_t;
 
-
+#define pager_ikot pager_header.io_bits
 
 
 device_pager_t
@@ -135,7 +136,7 @@ device_pager_bootstrap(void)
 memory_object_t
 device_pager_setup(
 	__unused memory_object_t device,
-	int		device_handle,
+	uintptr_t		device_handle,
 	vm_size_t	size,
 	int		flags)
 {
@@ -183,10 +184,12 @@ device_pager_populate_object(
 
 	if(!vm_object->phys_contiguous) {
 		unsigned int null_size = 0;
+		assert((upl_size_t) size == size);
         	kr = vm_object_upl_request(vm_object,
-             		(vm_object_offset_t)offset, size, &upl,  NULL,
-			&null_size, (UPL_NO_SYNC | UPL_CLEAN_IN_PLACE)); 
-
+					   (vm_object_offset_t)offset,
+					   (upl_size_t) size, &upl,  NULL,
+					   &null_size,
+					   (UPL_NO_SYNC | UPL_CLEAN_IN_PLACE));
 		if(kr != KERN_SUCCESS)
 			panic("device_pager_populate_object: list_req failed");
 
@@ -219,7 +222,7 @@ kern_return_t
 device_pager_init(
 	memory_object_t mem_obj, 
 	memory_object_control_t control, 
-	__unused vm_size_t pg_size)
+	__unused memory_object_cluster_size_t pg_size)
 {
 	device_pager_t   device_object;
 	kern_return_t   kr;
@@ -277,7 +280,7 @@ kern_return_t
 device_pager_data_return(
 	memory_object_t			mem_obj,
 	memory_object_offset_t		offset,
-	vm_size_t			data_cnt,
+	memory_object_cluster_size_t			data_cnt,
 	__unused memory_object_offset_t	*resid_offset,
 	__unused int			*io_error,
 	__unused boolean_t		dirty,
@@ -303,8 +306,9 @@ kern_return_t
 device_pager_data_request(
 	memory_object_t		mem_obj,
 	memory_object_offset_t	offset,
-	vm_size_t		length,
-	__unused vm_prot_t		protection_required)
+	memory_object_cluster_size_t		length,
+	__unused vm_prot_t	protection_required,
+        __unused memory_object_fault_info_t 	fault_info)
 {
 	device_pager_t	device_object;
 
@@ -374,7 +378,7 @@ kern_return_t
 device_pager_data_initialize(
         __unused memory_object_t		mem_obj,
         __unused memory_object_offset_t	offset,
-        __unused vm_size_t		data_cnt)
+        __unused memory_object_cluster_size_t		data_cnt)
 {
 	panic("device_pager_data_initialize");
 	return KERN_FAILURE;
@@ -384,7 +388,7 @@ kern_return_t
 device_pager_data_unlock(
 	__unused memory_object_t		mem_obj,
 	__unused memory_object_offset_t	offset,
-	__unused vm_size_t		size,
+	__unused memory_object_size_t		size,
 	__unused vm_prot_t		desired_access)
 {
 	return KERN_FAILURE;
@@ -406,7 +410,7 @@ kern_return_t
 device_pager_synchronize(
 	memory_object_t		mem_obj,
 	memory_object_offset_t	offset,
-	vm_offset_t		length,
+	memory_object_size_t		length,
 	__unused vm_sync_t		sync_flags)
 {
 	device_pager_t	device_object;
@@ -423,7 +427,15 @@ device_pager_synchronize(
  *
  */
 kern_return_t
-device_pager_unmap(
+device_pager_map(
+	__unused memory_object_t	mem_obj,
+	__unused vm_prot_t		prot)
+{
+	return KERN_SUCCESS;
+}
+
+kern_return_t
+device_pager_last_unmap(
 	__unused memory_object_t	mem_obj)
 {
 	return KERN_SUCCESS;
@@ -435,7 +447,7 @@ device_pager_unmap(
  *
  */
 device_pager_t
-device_object_create()
+device_object_create(void)
 {
 	register device_pager_t  device_object;