xnu-1504.9.26.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 d4336b38443f7eaac4e67ea737f332b57498a76f..993b124f9f33c39dea238f8b6a61e0c2ad65c1a0 100644 (file)
--- a/pexpert/ppc/pe_identify_machine.c
+++ b/pexpert/ppc/pe_identify_machine.c
@@ -29,6 +29,13 @@
 #include <pexpert/pexpert.h>
 #include <pexpert/ppc/powermac.h>
 #include <pexpert/device_tree.h>
+#include <vm/pmap.h>
+
+extern void panic(const char *str, ...);
+
+/* Local declarations */
+void pe_identify_machine(void);
+vm_offset_t get_io_base_addr(void);
 
 /* pe_identify_machine:
  *
@@ -39,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));
@@ -120,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))
@@ -181,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 */
 }