xnu-1504.15.3.tar.gz

[apple/xnu.git] / pexpert / ppc / pe_identify_machine.c

diff --git a/pexpert/ppc/pe_identify_machine.c b/pexpert/ppc/pe_identify_machine.c
index 558d6bd6550b2aa22e8789f755569e7ab783a874..993b124f9f33c39dea238f8b6a61e0c2ad65c1a0 100644 (file)
--- a/pexpert/ppc/pe_identify_machine.c
+++ b/pexpert/ppc/pe_identify_machine.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,16 +23,19 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <pexpert/protos.h>
 #include <pexpert/pexpert.h>
 #include <pexpert/ppc/powermac.h>
 #include <pexpert/device_tree.h>
+#include <vm/pmap.h>
 
-/* External declarations */
+extern void panic(const char *str, ...);
 
-unsigned int LockTimeOut = 12500000;
+/* Local declarations */
+void pe_identify_machine(void);
+vm_offset_t get_io_base_addr(void);
 
 /* pe_identify_machine:
  *
@@ -40,7 +46,7 @@ void pe_identify_machine(void)
 {
   DTEntry       cpu, root;
   unsigned long *value;
-  int           size;
+  unsigned int  size;
 
   // Clear the gPEClockFrequencyInfo struct
   bzero((void *)&gPEClockFrequencyInfo, sizeof(clock_frequency_info_t));
@@ -121,7 +127,7 @@ vm_offset_t get_io_base_addr(void)
 {
   DTEntry     entryP;
   vm_offset_t *address;
-  int         size;
+  unsigned int size;
   
   if ((DTFindEntry("device_type", "dbdma", &entryP) == kSuccess)
       || (DTFindEntry("device_type", "mac-io", &entryP) == kSuccess))
@@ -182,7 +188,7 @@ unsigned int PE_init_taproot(vm_offset_t *taddr)
 
        tappdata[1] = (tappdata[1] + 4095 ) & -4096;    /* Make sure this is a whole page */
 
-       *taddr = io_map_spec(tappdata[0], tappdata[1]);         /* Map it in and return the address */
+       *taddr = io_map_spec(tappdata[0], tappdata[1], VM_WIMG_IO);     /* Map it in and return the address */
        tappdata[0] = *taddr;                                   /* Also change property */
        return tappdata[1];                                             /* And the size */
 }