xnu-792.6.56.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 b83e3eb02bc7587999300e3c2923cb57a20510f6..e6cd3ccaf47990a6bedd653698b1bb844ba12a0d 100644 (file)
--- a/osfmk/i386/io_map.c
+++ b/osfmk/i386/io_map.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -75,11 +76,21 @@ 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);
        }
        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);
        }
-       (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)
+{
+  return (io_map(phys_addr, size));
+}