Chameleon

Chameleon Commit Details

Date:2010-08-21 10:27:21 (9 years 2 months ago)
Author:Azimutz
Commit:407
Parents: 406
Message:Same as rev 406.
Changes:
M/branches/azimutz/Chazileon/i386/boot2/boot.c

File differences

branches/azimutz/Chazileon/i386/boot2/boot.c
410410
411411
412412
413
413
414414
415415
416416
......
424424
425425
426426
427
428
429
430
431
432427
428
429
430
431
432
433433
434434
435435
......
467467
468468
469469
470
470
471471
472
472473
473474
474475
475
476476
477477
478
479
478
480479
481480
482481
483
482
484483
485484
486485
......
489488
490489
491490
492
491
493492
494493
495494
firstRun = false;
if ( status == -1 ) continue;
//Azi: doing this earlier to get the verbose from loadOverrideConfig.
//Azi: i'm now almost sure that here is the right place to do this! - test (gBootVolume == NULL)
// Turn off any GUI elements, draw background and update VRAM.
if ( bootArgs->Video.v_display == GRAPHICS_MODE )
{
}
//Azi:autoresolution begin
/*
* AutoResolution - Reapply the patch or cancel if Graphics Mode was incorrect
*or EDID Info was insane
*/
getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig);
//
//AutoResolution - Reapply the patch or cancel if Graphics Mode was incorrect
//or EDID Info was insane
getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig);
//Restore the vbios for Cancelation
if ((gAutoResolution == false) && map)
{
{
patchVbios(map, params[0], params[1], params[2], 0, 0);
}
closeVbios(map); // doesn't print to screen from here
closeVbios(map);
}
//Azi:autoresolution end
status = processBootOptions();
// Status == 1 means to chainboot
if ( status ==1 ) break;
// Status == -1 means that gBootVolume is NULL - Azi: little edit to reflect current status.
// Status == -1 means that gBootVolume is NULL. Config file is not mandatory anymore!
if ( status == -1 )
{
// gBootVolume == NULL usually means the user hit escape.
if (gBootVolume == NULL) //Azi: hitting escape makes me boot when "at" boot prompt.
if (gBootVolume == NULL)
{
freeFilteredBVChain(bvChain);
bvChain = newFilteredBVChain(0x80, 0xFF, allowBVFlags, denyBVFlags, &gDeviceCount);
setBootGlobals(bvChain);
setupDeviceList(&bootInfo->themeConfig); //Azi: check this - position test!!!
setupDeviceList(&bootInfo->themeConfig);
}
continue;
}

Archive Download the corresponding diff file

Revision: 407