xnu-1699.26.8.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 fc29c1a6525034ef70f35e9a7c9b2529668ed5b0..80335544f161ceb0f0192063f2dadeda632c7092 100644 (file)
--- a/pexpert/i386/pe_init.c
+++ b/pexpert/i386/pe_init.c
@@ -44,6 +44,12 @@
 
 /* extern references */
 extern void pe_identify_machine(void * args);
+extern int
+vc_display_lzss_icon(uint32_t dst_x,       uint32_t dst_y,
+                     uint32_t image_width, uint32_t image_height,
+                     const uint8_t *compressed_image,
+                     uint32_t       compressed_size, 
+                     const uint8_t *clut);
 
 /* private globals */
 PE_state_t  PE_state;
@@ -54,6 +60,9 @@ clock_frequency_info_t gPEClockFrequencyInfo;
 void *gPEEFISystemTable;
 void *gPEEFIRuntimeServices;
 
+static boot_icon_element* norootIcon_lzss;
+static const uint8_t*     norootClut_lzss;
+
 int PE_initialize_console( PE_Video * info, int op )
 {
     static int   last_console = -1;
@@ -104,12 +113,16 @@ void PE_init_iokit(void)
     } DriversPackageProp;
 
     boolean_t bootClutInitialized = FALSE;
-    boolean_t norootInitialized = FALSE;
+    boolean_t noroot_rle_Initialized = FALSE;
+
     DTEntry             entry;
     unsigned int       size;
     uint32_t           *map;
        boot_progress_element *bootPict;
 
+    norootIcon_lzss = NULL;
+    norootClut_lzss = NULL;
+
     PE_init_kprintf(TRUE);
     PE_init_printf(TRUE);
 
@@ -120,34 +133,45 @@ void PE_init_iokit(void)
      */
 
     if( kSuccess == DTLookupEntry(NULL, "/chosen/memory-map", &entry)) {
-       if( kSuccess == DTGetProperty(entry, "BootCLUT", (void **) &map, &size)) {
-           if (sizeof(appleClut8) <= map[1]) {
-               bcopy( (void *)ml_static_ptovirt(map[0]), appleClut8, sizeof(appleClut8) );
-               bootClutInitialized = TRUE;
-           }
-       }
-
-       if( kSuccess == DTGetProperty(entry, "Pict-FailedBoot", (void **) &map, &size)) {
-           bootPict = (boot_progress_element *) ml_static_ptovirt(map[0]);
-           default_noroot.width  = bootPict->width;
-           default_noroot.height = bootPict->height;
-           default_noroot.dx     = 0;
-           default_noroot.dy     = bootPict->yOffset;
-           default_noroot_data   = &bootPict->data[0];
-            norootInitialized = TRUE;
-       }
+        if( kSuccess == DTGetProperty(entry, "BootCLUT", (void **) &map, &size)) {
+            if (sizeof(appleClut8) <= map[1]) {
+                bcopy( (void *)ml_static_ptovirt(map[0]), appleClut8, sizeof(appleClut8) );
+                bootClutInitialized = TRUE;
+            }
+        }
+
+        if( kSuccess == DTGetProperty(entry, "Pict-FailedBoot", (void **) &map, &size)) {
+            bootPict = (boot_progress_element *) ml_static_ptovirt(map[0]);
+            default_noroot.width  = bootPict->width;
+            default_noroot.height = bootPict->height;
+            default_noroot.dx     = 0;
+            default_noroot.dy     = bootPict->yOffset;
+            default_noroot_data   = &bootPict->data[0];
+            noroot_rle_Initialized = TRUE;
+        }
+
+        if( kSuccess == DTGetProperty(entry, "FailedCLUT", (void **) &map, &size)) {
+               norootClut_lzss = (uint8_t*) ml_static_ptovirt(map[0]);
+        }
+
+        if( kSuccess == DTGetProperty(entry, "FailedImage", (void **) &map, &size)) {
+            norootIcon_lzss = (boot_icon_element *) ml_static_ptovirt(map[0]);
+            if (norootClut_lzss == NULL) {
+                    printf("ERROR: No FailedCLUT provided for noroot icon!\n");
+            }
+        }
     }
 
     if (!bootClutInitialized) {
-    bcopy( (void *) (uintptr_t) bootClut, (void *) appleClut8, sizeof(appleClut8) );
+        bcopy( (void *) (uintptr_t) bootClut, (void *) appleClut8, sizeof(appleClut8) );
     }
 
-    if (!norootInitialized) {
-    default_noroot.width  = kFailedBootWidth;
-    default_noroot.height = kFailedBootHeight;
-    default_noroot.dx     = 0;
-    default_noroot.dy     = kFailedBootOffset;
-    default_noroot_data   = failedBootPict;
+    if (!noroot_rle_Initialized) {
+        default_noroot.width  = kFailedBootWidth;
+        default_noroot.height = kFailedBootHeight;
+        default_noroot.dx     = 0;
+        default_noroot.dy     = kFailedBootOffset;
+        default_noroot_data   = failedBootPict;
     }
     
     /*
@@ -214,8 +238,22 @@ int PE_current_console( PE_Video * info )
 
 void PE_display_icon( __unused unsigned int flags, __unused const char * name )
 {
-    if ( default_noroot_data )
+    if ( norootIcon_lzss && norootClut_lzss ) {
+        uint32_t width  = norootIcon_lzss->width;
+        uint32_t height = norootIcon_lzss->height;
+        uint32_t x = ((PE_state.video.v_width  - width) / 2);
+        uint32_t y = ((PE_state.video.v_height - height) / 2) + norootIcon_lzss->y_offset_from_center;
+
+        vc_display_lzss_icon(x, y, width, height,
+                             &norootIcon_lzss->data[0],
+                             norootIcon_lzss->data_size,
+                             norootClut_lzss);
+    }
+    else if ( default_noroot_data ) {
         vc_display_icon( &default_noroot, default_noroot_data );
+    } else {
+        printf("ERROR: No data found for noroot icon!\n");
+    }
 }
 
 boolean_t