Chameleon

Chameleon Commit Details

Date:2011-06-25 23:56:53 (8 years 1 month ago)
Author:Azimutz
Commit:1077
Parents: 1076
Message:Removing this info from DEBUG's realm. This will be enabled by default until i gather enough feedback to decide whether it will stay On or Off by default. This info display, is only available on Gui; ShowInfo=No disables it. For the Gui minimalist, "Boot Banner"=No also disables it. Ok, "house cleaning" is suspended until i figure out what Meklort's cooking over at that new branch... "rewrite" :-o just the name sounds scary :-D
Changes:
M/trunk/doc/BootHelp.txt
M/trunk/i386/boot2/gui.c
M/trunk/i386/boot2/boot.h
M/trunk/CHANGES
M/trunk/i386/boot2/options.c

File differences

trunk/i386/boot2/boot.h
6060
6161
6262
63
6364
6465
6566
#define kDefaultKernel"mach_kernel"
#define kGUIKey"GUI"
#define kBootBannerKey"Boot Banner"
#define kShowInfoKey"ShowInfo"// gui.c
#define kWaitForKeypressKey"Wait"
#define kDSDT"DSDT"/* acpi_patcher.c */
trunk/i386/boot2/gui.c
800800
801801
802802
803
804
803
804
805
806
805807
806808
807809
......
857859
858860
859861
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
877885
878886
879887
void drawDeviceList (int start, int end, int selection)
{
int i;
position_t p, p_prev, p_next;
inti;
boolshoWinfo = true; //Azi:showinfo
extern bool showBootBanner; //
position_tp, p_prev, p_next;
//uint8_tmaxDevices = MIN( gui.maxdevices, menucount );
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(kShowInfoKey, &shoWinfo, &bootInfo->bootConfig);
if (shoWinfo && showBootBanner) // no boot banner, no showinfo.
{
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 ); //Azi: reminder
//dprintf( &gui.screen, "mm: %d\n", gui.screen.mm );
}
}
drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected);
trunk/i386/boot2/options.c
3030
3131
3232
33
3334
3435
3536
......
873874
874875
875876
876
877877
878878
879879
#include "embedded.h"
#include "pci.h"
bool showBootBanner = true; //Azi:showinfo
static bool shouldboot = false;
extern int multiboot_timeout;
gui.devicelist.draw = true;
gui.redraw = true;
if (!(gBootMode & kBootModeQuiet)) {
bool showBootBanner = true;
// Check if "Boot Banner"=N switch is present in config file.
getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig);
trunk/doc/BootHelp.txt
6262
6363
6464
65
66
6567
6668
6769
GUI=No Disable the GUI (enabled by default).
"Boot Banner"=Yes|No Show boot banner in GUI mode (enabled by default).
ShowInfo=No Disables display of partition and resolution details.
"Boot Banner"=No will also disable this info.
"Legacy Logo"=Yes|No Use the legacy grey apple logo (disabled by default).
PciRoot=<value> Use an alternate value for PciRoot (default value 0).
trunk/CHANGES
1
2
3
14
25
36
- Added "ShowInfo" key (enabled by default for now), which enables/disables the display of
partition and resolution related info, on the Gui.
This info may not play well with some custom themes.
- Modules can now be selected between not compiled, compiled into chameleon, or compiled as modules.
- New makefile + configuration system.
- Added the BOOT2_MAX_LENGTH constant in memory.h. This is now used in mboot.c to relocate the correct

Archive Download the corresponding diff file

Revision: 1077