X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..0c530ab8987f0ae6a1a3d9284f40182b88852816:/pexpert/ppc/pe_init.c?ds=inline

diff --git a/pexpert/ppc/pe_init.c b/pexpert/ppc/pe_init.c
index afffd30bf..38ff042ca 100644
--- a/pexpert/ppc/pe_init.c
+++ b/pexpert/ppc/pe_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -23,7 +23,6 @@
  * file: pe_init.c
  *    PPC platform expert initialization.
  */
-#include <mach/boot_info.h>
 #include <mach/time_value.h>
 #include <pexpert/protos.h>
 #include <pexpert/pexpert.h>
@@ -32,6 +31,8 @@
 #include <pexpert/pe_images.h>
 #include <kern/debug.h>
 #include <kern/sched_prim.h>
+#include <vm/pmap.h>
+
 
 /* extern references */
 void pe_identify_machine(void);
@@ -119,16 +120,11 @@ void PE_init_iokit(void)
     kern_return_t	ret;
     DTEntry		entry;
     int			size;
-    int			i;
     void **		map;
 
     PE_init_kprintf(TRUE);
     PE_init_printf(TRUE);
 
-    // init this now to get mace debugger for iokit startup
-    PE_init_ethernet_debugger();
-
-    
     if( kSuccess == DTLookupEntry(0, "/chosen/memory-map", &entry)) {
 
 	boot_progress_element * bootPict;
@@ -146,17 +142,21 @@ void PE_init_iokit(void)
 	    default_noroot_data   = &bootPict->data[0];
 	}
     }
+    panic_ui_initialize( (unsigned char *) appleClut8 );
     vc_progress_initialize( &default_progress, default_progress_data, (unsigned char *) appleClut8 );
 
-    PE_initialize_console( (PE_Video *) 0, kPEAcquireScreen );
-
-    ret = StartIOKit( PE_state.deviceTreeHead, PE_state.bootArgs,
-			(void *)0, (void *)0);
+    ret = StartIOKit( PE_state.deviceTreeHead, PE_state.bootArgs, (void *)0, (void *)0);
 }
 
 void PE_init_platform(boolean_t vm_initialized, void *_args)
 {
-        boot_args *args = (boot_args *)_args;
+	DTEntry dsouth, dnorth, root, dcpu;
+	char *model;
+	int msize, size;
+	uint32_t *south, *north, *pdata, *ddata;
+	int i;
+	
+	boot_args *args = (boot_args *)_args;
 
 	if (PE_state.initialized == FALSE)
 	{
@@ -187,20 +187,22 @@ void PE_init_platform(boolean_t vm_initialized, void *_args)
 	else
 	{
 	    pe_init_debug();
+	
 	}
 }
 
 void PE_create_console( void )
 {
-  if (PE_state.video.v_display)
-    PE_initialize_console( &PE_state.video, kPEGraphicsMode );
-  else
-    PE_initialize_console( &PE_state.video, kPETextMode );
+    if ( PE_state.video.v_display )
+        PE_initialize_console( &PE_state.video, kPEGraphicsMode );
+    else
+        PE_initialize_console( &PE_state.video, kPETextMode );
 }
 
 int PE_current_console( PE_Video * info )
 {
     *info = PE_state.video;
+    info->v_baseAddr = 0;
     return( 0);
 }
 
@@ -245,8 +247,8 @@ void PE_call_timebase_callback(void)
   struct timebase_freq_t timebase_freq;
   unsigned long          num, den, cnt;
   
-  num = gPEClockFrequencyInfo.bus_clock_rate_num * gPEClockFrequencyInfo.bus_to_dec_rate_num;
-  den = gPEClockFrequencyInfo.bus_clock_rate_den * gPEClockFrequencyInfo.bus_to_dec_rate_den;
+  num = gPEClockFrequencyInfo.timebase_frequency_num;
+  den = gPEClockFrequencyInfo.timebase_frequency_den;
   
   cnt = 2;
   while (cnt <= den) {