xnu-792.24.17.tar.gz

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

diff --git a/osfmk/ppc/io_map.c b/osfmk/ppc/io_map.c
index 4a1824f327fda98bf451229a1d36d7acc1981e45..3c47658ec6788641b15ef948e6536d294e8d7938 100644 (file)
--- a/osfmk/ppc/io_map.c
+++ b/osfmk/ppc/io_map.c
@@ -3,22 +3,19 @@
  *
  * @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@
  */
@@ -65,13 +62,13 @@ io_map(phys_addr, size)
 
        if (phys_addr != 0) {                                           /* If they supplied a physical address, use it */
 
-               size = round_page_32(size + (phys_addr & PAGE_MASK));   /* Make sure we map all of it */
+               size = round_page(size + (phys_addr & PAGE_MASK));      /* Make sure we map all of it */
 
                (void) kmem_alloc_pageable(kernel_map, &start, size);   /* Get some virtual addresses to use */
                
                (void)mapping_make(kernel_pmap, (addr64_t)start, (ppnum_t)(phys_addr >> 12), 
                        (mmFlgBlock | mmFlgUseAttr | mmFlgCInhib | mmFlgGuarded),       /* Map as I/O page */
-                       size >> 12, VM_PROT_READ|VM_PROT_WRITE);
+                       (size >> 12), VM_PROT_READ|VM_PROT_WRITE);
 
                return (start + (phys_addr & PAGE_MASK));       /* Pass back the physical address */
        
@@ -108,10 +105,6 @@ io_map(phys_addr, size)
 vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size)
 {
        vm_offset_t     start;
-       int             i;
-       unsigned int j;
-       vm_page_t       m;
-
 
        if(kernel_map != VM_MAP_NULL) {                         /* If VM system is up, redirect to normal routine */
                
@@ -119,12 +112,12 @@ vm_offset_t io_map_spec(vm_offset_t phys_addr, vm_size_t size)
        
        }
        
-       size = round_page_32(size + (phys_addr - (phys_addr & -PAGE_SIZE)));    /* Extend the length to include it all */
+       size = round_page(size + (phys_addr - (phys_addr & -PAGE_SIZE)));       /* Extend the length to include it all */
        start = pmap_boot_map(size);                            /* Get me some virtual address */
 
        (void)mapping_make(kernel_pmap, (addr64_t)start, (ppnum_t)(phys_addr >> 12), 
                (mmFlgBlock | mmFlgUseAttr | mmFlgCInhib | mmFlgGuarded),       /* Map as I/O page */
-               size >> 12, VM_PROT_READ|VM_PROT_WRITE);
+               (size >> 12), VM_PROT_READ|VM_PROT_WRITE);
 
        return (start + (phys_addr & PAGE_MASK));
 }