Index: branches/meklort/i386/boot2/resume.c =================================================================== --- branches/meklort/i386/boot2/resume.c (revision 634) +++ branches/meklort/i386/boot2/resume.c (revision 635) @@ -51,7 +51,7 @@ u_int32_t lowHalf, highHalf; u_int32_t sum; - printf("\nWake Kernel!\n"); + verbose("\nWake Kernel!\n"); dst = (unsigned long *) (header->restore1CodePage << 12); count = header->restore1PageCount; @@ -105,7 +105,7 @@ long buffer; size = ReadFileAtOffset (image_filename, header, 0, sizeof(IOHibernateImageHeader)); - printf("header read size %x\n", size); + verbose("header read size %x\n", size); imageSize = header->image1Size; codeSize = header->restore1PageCount << 12; @@ -138,7 +138,7 @@ mem_base = getmemorylimit() - allocSize;//TODO: lower this - printf("mem_base %x\n", mem_base); + verbose("mem_base %x\n", mem_base); // Rek : hibernate fix if (!((long long)mem_base+allocSize<1024*bootInfo->extmem+0x100000)) { Index: branches/meklort/i386/boot2/graphics.c =================================================================== --- branches/meklort/i386/boot2/graphics.c (revision 634) +++ branches/meklort/i386/boot2/graphics.c (revision 635) @@ -327,6 +327,7 @@ // VESA mode. bootArgs->Video.v_display = GRAPHICS_MODE; + // setVideoMode(GRAPHICS_MODE, 0); bootArgs->Video.v_width = minfo.XResolution; bootArgs->Video.v_height = minfo.YResolution; bootArgs->Video.v_depth = minfo.BitsPerPixel; Index: branches/meklort/i386/boot2/boot.c =================================================================== --- branches/meklort/i386/boot2/boot.c (revision 634) +++ branches/meklort/i386/boot2/boot.c (revision 635) @@ -134,7 +134,7 @@ //========================================================================== // execKernel - Load the kernel image (mach-o) and jump to its entry point. -static int ExecKernel(void *binary) +int ExecKernel(void *binary) { entry_t kernelEntry; int ret; @@ -149,13 +149,13 @@ if ( ret != 0 ) return ret; - // Reserve space for boot args reserveKernBootStruct(); // Load boot drivers from the specifed root path. + execute_hook("DecodedKernel", (void*)binary, NULL, NULL, NULL); + - setupFakeEfi(); if (!gHaveKernelCache) { @@ -185,7 +185,8 @@ } #endif bool dummyVal; - if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) { + if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) + { printf("Press any key to continue..."); getc(); } @@ -324,6 +325,8 @@ load_all_modules(); } + execute_hook("ModulesLoaded", NULL, NULL, NULL, NULL); + #ifndef OPTION_ROM // Loading preboot ramdisk if exists. Index: branches/meklort/i386/boot2/modules.h =================================================================== --- branches/meklort/i386/boot2/modules.h (revision 634) +++ branches/meklort/i386/boot2/modules.h (revision 635) @@ -100,6 +100,6 @@ int replace_function(const char* symbol, void* newAddress); -extern unsigned int (*lookup_symbol)(const char*); +//extern unsigned int (*lookup_symbol)(const char*); #endif /* __BOOT_MODULES_H */ \ No newline at end of file