xnu-517.tar.gz

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

diff --git a/pexpert/ppc/pe_init.c b/pexpert/ppc/pe_init.c
index 478455a006b07f444795b26c1574301eab02aef5..2dcfd4ce9bf7e532af2790e84dcbe0d2ccb6eaff 100644 (file)
--- a/pexpert/ppc/pe_init.c
+++ b/pexpert/ppc/pe_init.c
@@ -122,7 +122,6 @@ void PE_init_iokit(void)
     kern_return_t      ret;
     DTEntry            entry;
     int                        size;
     kern_return_t      ret;
     DTEntry            entry;
     int                        size;

-    int                        i;

     void **            map;
 
     PE_init_kprintf(TRUE);
     void **            map;
 
     PE_init_kprintf(TRUE);


@@ -145,12 +144,10 @@ void PE_init_iokit(void)
            default_noroot_data   = &bootPict->data[0];
        }
     }
            default_noroot_data   = &bootPict->data[0];
        }
     }

+    panic_ui_initialize( (unsigned char *) appleClut8 );

     vc_progress_initialize( &default_progress, default_progress_data, (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)
 }
 
 void PE_init_platform(boolean_t vm_initialized, void *_args)


@@ -191,10 +188,10 @@ void PE_init_platform(boolean_t vm_initialized, void *_args)
 
 void PE_create_console( void )
 {
 
 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 )
 }
 
 int PE_current_console( PE_Video * info )