xnu-3789.41.3.tar.gz

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

diff --git a/pexpert/i386/pe_init.c b/pexpert/i386/pe_init.c
index 35d44a25c20c746a37937392a1a6f34a5c731452..f1e24b31e7b145d79861ee8123f98fad995d23b8 100644 (file)
--- a/pexpert/i386/pe_init.c
+++ b/pexpert/i386/pe_init.c
@@ -189,14 +189,25 @@ void PE_init_platform(boolean_t vm_initialized, void * _args)
         // New EFI-style
         PE_state.bootArgs           = _args;
         PE_state.deviceTreeHead            = (void *) ml_static_ptovirt(args->deviceTreeP);
-        PE_state.video.v_baseAddr   = args->Video.v_baseAddr; // remains physical address
-        PE_state.video.v_rowBytes   = args->Video.v_rowBytes;
-        PE_state.video.v_width     = args->Video.v_width;
-        PE_state.video.v_height            = args->Video.v_height;
-        PE_state.video.v_depth     = args->Video.v_depth;
-        PE_state.video.v_display    = args->Video.v_display;
-        strlcpy(PE_state.video.v_pixelFormat, "PPPPPPPP",
-               sizeof(PE_state.video.v_pixelFormat));
+        if (args->Video.v_baseAddr) {
+            PE_state.video.v_baseAddr   = args->Video.v_baseAddr; // remains physical address
+            PE_state.video.v_rowBytes   = args->Video.v_rowBytes;
+            PE_state.video.v_width         = args->Video.v_width;
+            PE_state.video.v_height        = args->Video.v_height;
+            PE_state.video.v_depth         = args->Video.v_depth;
+            PE_state.video.v_display    = args->Video.v_display;
+            strlcpy(PE_state.video.v_pixelFormat, "PPPPPPPP",
+                sizeof(PE_state.video.v_pixelFormat));
+        } else {
+            PE_state.video.v_baseAddr   = args->VideoV1.v_baseAddr; // remains physical address
+            PE_state.video.v_rowBytes   = args->VideoV1.v_rowBytes;
+            PE_state.video.v_width         = args->VideoV1.v_width;
+            PE_state.video.v_height        = args->VideoV1.v_height;
+            PE_state.video.v_depth         = args->VideoV1.v_depth;
+            PE_state.video.v_display    = args->VideoV1.v_display;
+            strlcpy(PE_state.video.v_pixelFormat, "PPPPPPPP",
+                    sizeof(PE_state.video.v_pixelFormat));
+        }
 
 #ifdef  kBootArgsFlagHiDPI
        if (args->flags & kBootArgsFlagHiDPI)
@@ -215,7 +226,6 @@ void PE_init_platform(boolean_t vm_initialized, void * _args)
         }
 
         pe_identify_machine(args);
-    } else {
         pe_init_debug();
     }
 
@@ -325,6 +335,11 @@ PE_reboot_on_panic(void)
                return FALSE;
 }
 
+void
+PE_sync_panic_buffers(void)
+{
+}
+
 /* rdar://problem/21244753 */
 uint32_t
 PE_i_can_has_debugger(uint32_t *debug_flags)