Chameleon

Chameleon Commit Details

Date:2011-06-26 01:54:11 (12 years 9 months ago)
Author:Azimutz
Commit:1082
Parents: 1081
Message:Keep up with trunk...
Changes:
M/branches/azimutz/Chazi/i386/boot2/options.c
M/branches/azimutz/Chazi/i386/boot2/drivers.c
M/branches/azimutz/Chazi/i386/boot2/graphics.c
M/branches/azimutz/Chazi/i386/boot2/gui.c
M/branches/azimutz/Chazi/i386/boot2/boot.h
M/branches/azimutz/Chazi/i386/boot2/gui.h

File differences

branches/azimutz/Chazi/i386/boot2/graphics.c
367367
368368
369369
370
371
370
371
372372
373373
374374
......
479479
480480
481481
482
482
483483
484
484
485485
486486
487487
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;␊
␉␉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;␊
branches/azimutz/Chazi/i386/boot2/drivers.c
279279
280280
281281
282
282
283283
284284
285285
286286
287287
288288
289
290289
291290
292291
␉{␊
␉␉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)␊
branches/azimutz/Chazi/i386/boot2/boot.h
103103
104104
105105
106
106
107107
108108
109109
......
117117
118118
119119
120
121
120
121
122122
123123
124124
#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??␊
#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***␊
branches/azimutz/Chazi/i386/boot2/gui.c
856856
857857
858858
859
860
859
860
861861
862862
863863
......
916916
917917
918918
919
919
920920
921
921
922922
923923
924924
......
934934
935935
936936
937
938
937
938
939939
940940
941941
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 );␊
␉␉␉␉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 );␊
␉␉␉␉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!␊
␉␉␉}␊
␉␉}␊
␉␉␊
branches/azimutz/Chazi/i386/boot2/gui.h
102102
103103
104104
105
105
106106
107107
108108
␉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;␊
␉␊
branches/azimutz/Chazi/i386/boot2/options.c
3131
3232
3333
34
34
3535
3636
3737
#include "options.h"␊
#include "efi.h"␊
␊
bool showBootBanner = true; //Azi:debuginfo␊
bool showBootBanner = true; //Azi:showinfo␊
static bool shouldboot = false;␊
␊
extern int multiboot_timeout;␊

Archive Download the corresponding diff file

Revision: 1082