Index: branches/azimutz/CleanCut/doc-azi/CHANGES.txt =================================================================== --- branches/azimutz/CleanCut/doc-azi/CHANGES.txt (revision 459) +++ branches/azimutz/CleanCut/doc-azi/CHANGES.txt (revision 460) @@ -258,6 +258,21 @@ ---------------//---------------//--------------- - (rev ) +Change: added a key to display some debug info, that can only be accessed via code edit. + Check http://forge.voodooprojects.org/p/chameleon/issues/12/ for history. + mm & attr, resolution specific info, are borrowed from AutoResolution branch. + + DebugInfo=y enables display of debug info. + + Note: Boot Banner(*)=n will override DebugInfo=y , disabling the display of this info. + Key is disabled by default. + +Motif: just making this info easily accessible. + + ---------------//---------------//--------------- + ---------------//---------------//--------------- + +- (rev ) Change: template Motif: Index: branches/azimutz/CleanCut/i386/boot2/graphics.c =================================================================== --- branches/azimutz/CleanCut/i386/boot2/graphics.c (revision 459) +++ branches/azimutz/CleanCut/i386/boot2/graphics.c (revision 460) @@ -369,6 +369,8 @@ unsigned char bitsPerPixel, unsigned short refreshRate ) { + bool debugInfo = false; //Azi:debuginfo + extern bool showBootBanner; // || VBEModeInfoBlock minfo; unsigned short mode; unsigned short vesaVersion; @@ -462,6 +464,14 @@ bootArgs->Video.v_rowBytes = minfo.BytesPerScanline; bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr); + //Azi: mm & attr info on DebugInfo - from AutoResolution branch. + getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); + + if (debugInfo && showBootBanner) + { + gui.screen.mm = minfo.MemoryModel; + gui.screen.attr = minfo.ModeAttributes; + } } while ( 0 ); Index: branches/azimutz/CleanCut/i386/boot2/boot.h =================================================================== --- branches/azimutz/CleanCut/i386/boot2/boot.h (revision 459) +++ branches/azimutz/CleanCut/i386/boot2/boot.h (revision 460) @@ -59,6 +59,7 @@ #define kInstantMenuKey "Instant Menu" // boot.c #define kGUIKey "GUI" // boot.c #define kBootBannerKey "Boot Banner" // options.c +#define kDebugInfoKey "DebugInfo" // gui.c, graphics.c #define kWaitForKeypressKey "Wait" // boot.c #define kExtensionsKey "kext" // drivers.c #define kUseAtiROM "UseAtiROM" // ati.c Index: branches/azimutz/CleanCut/i386/boot2/gui.c =================================================================== --- branches/azimutz/CleanCut/i386/boot2/gui.c (revision 459) +++ branches/azimutz/CleanCut/i386/boot2/gui.c (revision 460) @@ -806,8 +806,10 @@ void drawDeviceList (int start, int end, int selection) { - int i; - position_t p, p_prev, p_next; + int i; + bool debugInfo = false; //Azi:debuginfo + extern bool showBootBanner; // || + position_t p, p_prev, p_next; //uint8_t maxDevices = MIN( gui.maxdevices, menucount ); @@ -863,23 +865,30 @@ if(gui.menu.draw) drawInfoMenuItems(); - -#if DEBUG - gui.debug.cursor = pos( 10, 100); - dprintf( &gui.screen, "label %s\n", param->label ); - dprintf( &gui.screen, "biosdev 0x%x\n", param->biosdev ); - dprintf(&gui.screen, "width %d\n", gui.screen.width); - dprintf(&gui.screen, "height %d\n", gui.screen.height); - dprintf( &gui.screen, "type 0x%x\n", param->type ); - dprintf( &gui.screen, "flags 0x%x\n", param->flags ); - dprintf( &gui.screen, "part_no %d\n", param->part_no ); - dprintf( &gui.screen, "part_boff 0x%x\n", param->part_boff ); - dprintf( &gui.screen, "part_type 0x%x\n", param->part_type ); - dprintf( &gui.screen, "bps 0x%x\n", param->bps ); - dprintf( &gui.screen, "name %s\n", param->name ); - dprintf( &gui.screen, "type_name %s\n", param->type_name ); - dprintf( &gui.screen, "modtime %d\n", param->modTime ); -#endif + + //Azi: make this info more accessible. + getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig); + + if (debugInfo && showBootBanner) + { + gui.debug.cursor = pos( 10, 100); + dprintf( &gui.screen, "label: %s\n", param->label ); + dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev ); + dprintf( &gui.screen, "type: 0x%x\n", param->type ); + dprintf( &gui.screen, "flags: 0x%x\n", param->flags ); + dprintf( &gui.screen, "part_no: %d\n", param->part_no ); + dprintf( &gui.screen, "part_boff: 0x%x\n", param->part_boff ); + dprintf( &gui.screen, "part_type: 0x%x\n", param->part_type ); + dprintf( &gui.screen, "bps: 0x%x\n", param->bps ); + dprintf( &gui.screen, "name: %s\n", param->name ); + dprintf( &gui.screen, "type_name: %s\n", param->type_name ); + 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 ); + } + } drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected); Index: branches/azimutz/CleanCut/i386/boot2/gui.h =================================================================== --- branches/azimutz/CleanCut/i386/boot2/gui.h (revision 459) +++ branches/azimutz/CleanCut/i386/boot2/gui.h (revision 460) @@ -96,6 +96,9 @@ uint32_t font_small_color; // Color for small font AARRGGBB uint32_t font_console_color; // Color for consle font AARRGGBB bool draw; // Draw flag + //resolution specifics + uint8_t mm; // Azi: debuginfo + uint16_t attr; } window_t; /* Index: branches/azimutz/CleanCut/i386/boot2/options.c =================================================================== --- branches/azimutz/CleanCut/i386/boot2/options.c (revision 459) +++ branches/azimutz/CleanCut/i386/boot2/options.c (revision 460) @@ -30,6 +30,7 @@ #include "embedded.h" #include "pci.h" +bool showBootBanner = true; //Azi:debuginfo static bool shouldboot = false; extern int multiboot_timeout; @@ -873,7 +874,7 @@ gui.devicelist.draw = true; gui.redraw = true; if (!(gBootMode & kBootModeQuiet)) { - bool showBootBanner = true; + //bool showBootBanner = true; Azi:debuginfo // Check if "Boot Banner"=N switch is present in config file. getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig);