Chameleon

Chameleon Commit Details

Date:2011-07-06 12:09:11 (12 years 9 months ago)
Author:Azimutz
Commit:1128
Parents: 1127
Message:Ensure correct plist is used for config values. (remaining, me thinks)
Changes:
M/trunk/i386/libsaio/pci_setup.c
M/trunk/i386/boot2/options.c
M/trunk/i386/modules/Resolution/edid.c

File differences

trunk/i386/libsaio/pci_setup.c
2121
2222
2323
24
25
26
24
25
26
2727
2828
2929
␊
␉do_eth_devprop = do_gfx_devprop = do_enable_hpet = false;␊
␊
␉getBoolForKey(kEthernetBuiltIn, &do_eth_devprop, &bootInfo->bootConfig);␊
␉getBoolForKey(kGraphicsEnabler, &do_gfx_devprop, &bootInfo->bootConfig);␊
␉getBoolForKey(kForceHPET, &do_enable_hpet, &bootInfo->bootConfig);␊
␉getBoolForKey(kEthernetBuiltIn, &do_eth_devprop, &bootInfo->chameleonConfig);␊
␉getBoolForKey(kGraphicsEnabler, &do_gfx_devprop, &bootInfo->chameleonConfig);␊
␉getBoolForKey(kForceHPET, &do_enable_hpet, &bootInfo->chameleonConfig);␊
␊
␉while (current)␊
␉{␊
trunk/i386/boot2/options.c
11991199
12001200
12011201
1202
1202
12031203
12041204
12051205
......
12511251
12521252
12531253
1254
1254
12551255
12561256
12571257
......
13121312
13131313
13141314
1315
1315
13161316
13171317
13181318
strcpy( bootInfo->bootFile, kernel );␊
gOverrideKernel = true;␊
} else {␊
if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->bootConfig ) ) {␊
if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->chameleonConfig ) ) {␊
strlcpy( bootInfo->bootFile, val, cnt+1 );␊
if (strcmp( bootInfo->bootFile, kDefaultKernel ) != 0) {␊
gOverrideKernel = true;␊
␊
if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config, &argP, &cntRemaining, gRootDevice)) {␊
cnt = 0;␊
if ( getValueForKey( kBootDeviceKey, &val, &cnt, &bootInfo->bootConfig)) {␊
if ( getValueForKey( kBootDeviceKey, &val, &cnt, &bootInfo->chameleonConfig)) {␊
valueBuffer[0] = '*';␊
cnt++;␊
strlcpy(valueBuffer + 1, val, cnt);␊
␉if(!shouldboot)␊
␉{␊
␉␉gVerboseMode = getValueForKey( kVerboseModeFlag, &val, &cnt, &bootInfo->chameleonConfig ) ||␊
␉␉␉getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->bootConfig );␊
␉␉␉getValueForKey( kSingleUserModeFlag, &val, &cnt, &bootInfo->chameleonConfig );␊
␉␉␊
␉␉gBootMode = ( getValueForKey( kSafeModeFlag, &val, &cnt, &bootInfo->chameleonConfig ) ) ?␊
␉␉␉kBootModeSafe : kBootModeNormal;␊
trunk/i386/modules/Resolution/edid.c
239239
240240
241241
242
242
243243
244244
245245
246246
247
247
248248
249249
250250
//␉int val;␊
␉static UInt32 xResolution, yResolution, bpResolution;␊
/*␊
␉if(getIntForKey(kScreenWidth, &val, &bootInfo->bootConfig))␊
␉if(getIntForKey(kScreenWidth, &val, &bootInfo->chameleonConfig))␊
␉{␊
␉␉xResolution = val;␊
␉}␊
␉␊
␉if(getIntForKey(kScreenHeight, &val, &bootInfo->bootConfig))␊
␉if(getIntForKey(kScreenHeight, &val, &bootInfo->chameleonConfig))␊
␉{␊
␉␉yResolution = val;␊
␉}␊

Archive Download the corresponding diff file

Revision: 1128