xnu-792.22.5.tar.gz

[apple/xnu.git] / osfmk / i386 / io_map.c

diff --git a/osfmk/i386/io_map.c b/osfmk/i386/io_map.c
index 9df7b001622d4ee6d484d67ccd31d6ca8f356637..40892578bf4b5917bb5999ddbcb408e086820b95 100644 (file)
--- a/osfmk/i386/io_map.c
+++ b/osfmk/i386/io_map.c
@@ -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@
@@ -66,9 +69,7 @@ extern vm_offset_t    virtual_avail;
  * Mach VM is running.
  */
 vm_offset_t
-io_map(phys_addr, size)
-       vm_offset_t     phys_addr;
-       vm_size_t       size;
+io_map(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
 {
        vm_offset_t     start;
 
@@ -78,18 +79,23 @@ io_map(phys_addr, size)
             */
            start = virtual_avail;
            virtual_avail += round_page(size);
+
+           (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),
+                              VM_PROT_READ|VM_PROT_WRITE,
+                              flags);
        }
        else {
            (void) kmem_alloc_pageable(kernel_map, &start, round_page(size));
+           (void) pmap_map(start, phys_addr, phys_addr + round_page(size),
+                           VM_PROT_READ|VM_PROT_WRITE,
+                           flags);
        }
-       (void) pmap_map_bd(start, phys_addr, phys_addr + round_page(size),
-                       VM_PROT_READ|VM_PROT_WRITE);
        return (start);
 }
 
 /* just wrap this since io_map handles it */
 
-vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size)
+vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size, unsigned int flags)
 {
-  return (io_map(phys_addr, size));
+  return (io_map(phys_addr, size, flags));
 }