Chameleon

Chameleon Commit Details

Date:2010-03-18 20:17:22 (9 years 3 months ago)
Author:DieBuche
Commit:130
Parents: 129
Message:added changes by azimutz. our versions should now be nearly equal. (excluding the ramdisk changes..)
Changes:
M/branches/diebuche/i386/boot2/gui.c
M/branches/diebuche/i386/boot2/boot.h
M/branches/diebuche/i386/boot2/options.c
M/branches/diebuche/i386/libsaio/dsdt_patcher.c
M/branches/diebuche/i386/boot2/boot.c

File differences

branches/diebuche/i386/libsaio/dsdt_patcher.c
7272
7373
7474
75
75
7676
7777
7878
......
8181
8282
8383
84
84
8585
8686
8787
}
return NULL;
}
/** The folowing ACPI Table search algo. should be reused anywhere needed:*/
/* The following ACPI Table search algo. should be reused anywhere needed:*/
int search_and_get_acpi_fd(const char * filename, const char ** outDirspec)
{
int fd=0;
static bool first_time =true;
int len=0;
/// Take in accound user overriding if it's DSDT only
// Take in accound user overriding if it's DSDT only
if (strstr(filename, "DSDT") &&
getValueForKey(kDSDT, &overriden_pathname, &len,
&bootInfo->bootConfig))
branches/diebuche/i386/boot2/boot.c
167167
168168
169169
170
170
171171
172172
173173
......
402402
403403
404404
405
406
407
408
409
410
411
405
412406
413407
414408
sleep(kBootErrorTimeout);
}
//if the vbios patch have been applied retore it before performing fake efi stuff
//if the vbios patch have been applied restore it before performing fake efi stuff
if (autoResolution == TRUE) {
unlock_vbios(map);
restore_vbios(map);
verbose("Patched resolution mode to %dx%d.\n", params[0], params[1]);
}
}
if (useGUI) {
/* XXX AsereBLN handle error */
initGUI();
branches/diebuche/i386/boot2/boot.h
5656
5757
5858
59
6059
6160
6261
......
8988
9089
9190
91
9292
9393
9494
#define kInsantMenuKey"Instant Menu"
#define kDefaultKernel"mach_kernel"
#define kGUIKey"GUI"
#define kAutoResolutionKey"AutoResolution"
#define kBootBannerKey"Boot Banner"
#define kWaitForKeypressKey"Wait"
/* AsereBLN: added the other keys */
#define kRenamePartition"Rename Partition"/* disk.c */
#define kUseMemDetect "UseMemDetect" /* platform.c */
#define kRestartFix "RestartFix" /* dsdt_patcher.c */
#define kAutoResolutionKey"AutoResolution" /* Azi: not present on lebibou diff */
/*
* Flags to the booter or kernel
branches/diebuche/i386/boot2/gui.c
557557
558558
559559
560
560
561561
562562
563563
......
579579
580580
581581
582
583
584
585
586
587
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
588606
589607
590608
......
16981716
16991717
17001718
1701
1719
17021720
17031721
17041722
int initGUI(void)
{
//int val;
int val;
#ifdef EMBED_THEME
config_file_t*config;
}
#endif
// parse display size parameters
/*if (getIntForKey("screen_width", &val, &bootInfo->themeConfig)) {
screen_params[0] = val;
}
if (getIntForKey("screen_height", &val, &bootInfo->themeConfig)) {
screen_params[1] = val;
}*/
if (autoResolution == TRUE) {
VBEModeInfoBlock minfo;
unsigned short mode_n;
unsigned short vesaVersion;
mode_n = getVESAModeWithProperties( screen_params[0], screen_params[1], 32, maColorModeBit |
maModeIsSupportedBit |
maGraphicsModeBit |
maLinearFrameBufferAvailBit,
0,
&minfo, &vesaVersion );
} else {
// parse screen size parameters
if(getIntForKey("screen_width", &val, &bootInfo->themeConfig))
screen_params[0] = val;
else
screen_params[0] = DEFAULT_SCREEN_WIDTH;
if(getIntForKey("screen_height", &val, &bootInfo->themeConfig))
screen_params[1] = val;
else
screen_params[1] = DEFAULT_SCREEN_HEIGHT;
}
screen_params[2] = 32;
// Initalizing GUI strucutre.
loadBootGraphics();
}
if (autoResolution = TRUE) {
if (autoResolution == TRUE) {
VBEModeInfoBlock minfo;
unsigned short mode_n;
unsigned short vesaVersion;
branches/diebuche/i386/boot2/options.c
11791179
11801180
11811181
1182
1182
11831183
11841184
11851185
// Load com.apple.Boot.plist from the selected volume
// and use its contents to override default bootConfig.
// This is not a mandatory opeartion anymore.
// This is not a mandatory operation anymore.
loadOverrideConfig(&bootInfo->overrideConfig);

Archive Download the corresponding diff file

Revision: 130