Index: branches/azimutz/Chazi/i386/boot2/graphics.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/graphics.c (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/graphics.c (revision 1082) @@ -367,8 +367,8 @@ unsigned char bitsPerPixel, unsigned short refreshRate ) { - bool debugInfo = false; //Azi:debuginfo - extern bool showBootBanner; // || + bool shoWinfo = true; //Azi:showinfo + extern bool showBootBanner; // VBEModeInfoBlock minfo; unsigned short mode; unsigned short vesaVersion; @@ -479,9 +479,9 @@ gui.screen.attr = minfo.ModeAttributes; #endif*/ //Azi: mm & attr info on DebugInfo - from autoResolution branch. - getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); + getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->bootConfig); - if (debugInfo && showBootBanner) + if (shoWinfo && showBootBanner) // no boot banner, no showinfo. { gui.screen.mm = minfo.MemoryModel; gui.screen.attr = minfo.ModeAttributes; Index: branches/azimutz/Chazi/i386/boot2/drivers.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/drivers.c (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/drivers.c (revision 1082) @@ -279,14 +279,13 @@ { ret = GetFileInfo(dirSpec, "Extensions", &flags, &time2); - verbose("(%s) Extensions time +1 = %d\n", __FUNCTION__, time2 + 1); + msglog("(%s) Extensions time +1 = %d\n", __FUNCTION__, time2 + 1); if ((ret != 0) || ((flags & kFileTypeMask) != kFileTypeDirectory) || (((gBootMode & kBootModeSafe) == 0) && (time == (time2 + 1)))) { sprintf(gDriverSpec, "%sExtensions.mkext", altDirSpec); - msglog("LoadDrivers: Loading from [%s]\n", gDriverSpec); if (LoadDriverMKext(gDriverSpec) == 0) Index: branches/azimutz/Chazi/i386/boot2/boot.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/boot.h (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/boot.h (revision 1082) @@ -103,7 +103,7 @@ #define kGUIKey "GUI" // boot.c getBoolFK #define kBootBannerKey "Boot Banner" // options.c getBoolFK #define kLegacyLogoKey "Legacy Logo" // gui.c getBoolFK - revert? -#define kDebugInfoKey "DebugInfo" // gui.c, graphics.c getBoolFK +#define kShowInfoKey "ShowInfo" // gui.c, graphics.c getBoolFK #define kRescanPromptKey "Rescan Prompt" // boot.c getBoolFK - cdrom only - firstrun #define kRescanKey "Rescan" // boot.c getBoolFK - cdrom only?? - firstrun #define kCDROMPromptKey "CD-ROM Prompt" // options.c getValFK - internal?? @@ -117,8 +117,8 @@ #define kBootDeviceKey "Boot Device" // options.c getValFK - kFlag/option?????? #define kBootUUIDKey "boot-uuid" // options.c processBootArg - kFlag #define kHelperRootUUIDKey "Root UUID" // options.c getValFK - kFlag -#define kArchKey "arch" // boot.c getValFK - kFlag - after all, -// it's to be passed via "kernel Flags" ?? - "man com.apple.Boot.plist" +// After all, it seems arch= is to be passed via "kernel Flags" ?? - "man com.apple.Boot.plist" +#define kArchKey "arch" // boot.c getValFK - kFlag #define kKernelNameKey "Kernel" // options.c getValFK - kFlag*** bFlag ? #define kKernelCacheKey "Kernel Cache" // boot.c getValFK - kFlag #define kKernelFlagsKey "Kernel Flags" // options.c getValFK - kFlags*** Index: branches/azimutz/Chazi/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.c (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/gui.c (revision 1082) @@ -856,8 +856,8 @@ void drawDeviceList (int start, int end, int selection) { int i; - bool debugInfo = false; //Azi:debuginfo - extern bool showBootBanner; // || + bool shoWinfo = true; //Azi:showinfo + extern bool showBootBanner; // position_t p, p_prev, p_next; //uint8_t maxDevices = MIN( gui.maxdevices, menucount ); @@ -916,9 +916,9 @@ drawInfoMenuItems(); //Azi: make this info more accessible. - getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); + getBoolForKey(kShowInfoKey, &shoWinfo, &bootInfo->bootConfig); - if (debugInfo && showBootBanner) + if (shoWinfo && showBootBanner) // no boot banner, no showinfo. { gui.debug.cursor = pos( 10, 100); dprintf( &gui.screen, "label: %s\n", param->label ); @@ -934,8 +934,8 @@ dprintf( &gui.screen, "modtime: %d\n", param->modTime ); dprintf( &gui.screen, "width: %d\n", gui.screen.width ); dprintf( &gui.screen, "height: %d\n", gui.screen.height ); - dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); - dprintf( &gui.screen, "mm: %d\n", gui.screen.mm ); + dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr ); //Azi: 1024x768 hides these 2 + dprintf( &gui.screen, "mm: %d\n", gui.screen.mm ); // on my 1440x900 screen.. need feedback! } } Index: branches/azimutz/Chazi/i386/boot2/gui.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.h (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/gui.h (revision 1082) @@ -102,7 +102,7 @@ uint16_t hsyncend; uint16_t vsyncstart; uint16_t vsyncend; - uint8_t mm; // Azi:autoresolution - debuginfo + uint8_t mm; // Azi:autoresolution - showinfo uint16_t attr; } window_t; Index: branches/azimutz/Chazi/i386/boot2/options.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/options.c (revision 1081) +++ branches/azimutz/Chazi/i386/boot2/options.c (revision 1082) @@ -31,7 +31,7 @@ #include "options.h" #include "efi.h" -bool showBootBanner = true; //Azi:debuginfo +bool showBootBanner = true; //Azi:showinfo static bool shouldboot = false; extern int multiboot_timeout;