Chameleon

Chameleon Commit Details

Date:2016-06-15 22:25:08 (7 years 10 months ago)
Author:ErmaC
Commit:2826
Parents: 2825
Message:typo kCsrActiveConfig instead of KCsrActiveConfig (boot.c)
Changes:
M/trunk/i386/boot2/drivers.c
M/trunk/i386/boot2/boot.c
M/trunk/i386/libsaio/cpu.c
M/trunk/i386/libsaio/bootstruct.c
M/trunk/i386/boot2/boot.h

File differences

trunk/i386/libsaio/bootstruct.c
155155
156156
157157
158
159
158
159
160160
161161
162162
......
257257
258258
259259
260
260
261261
262
263
264
265
262266
263267
264268
␉/* Memory size to use for defaults calculations (cparm) */␊
␉uint64_t␉sane_size = 0;␊
␊
␉EfiMemoryRange *memoryMap␉= NULL;␊
␉MemoryRange *range␉␉= NULL;␊
␉EfiMemoryRange␉*memoryMap␉= NULL;␊
␉MemoryRange␉*range␉␉= NULL;␊
␉int memoryMapCount = bootInfo->memoryMapCount;␊
␊
␉if (memoryMapCount == 0)␊
␉␉ * For user visible memory size, round up to 128 Mb - accounting for the various stolen memory␊
␉␉ * not reported by EFI. (cparm)␊
␉␉ */␊
␊
#if DEBUG_BOOTSTRUCT␊
␉␉sane_size = (sane_size + 128 * MEG - 1) & ~((uint64_t)(128 * MEG - 1));␊
␉␉DBG( "Total amount of physical RAM in the system : %d\n", ((sane_size + 128 * MEG - 1) & ~((uint64_t)(128 * MEG - 1))) );␊
#else␊
␉␉DBG( "Total amount of RAM in the system : %d\n", sane_size );␊
#endif␊
␉␉bootArgs->PhysicalMemorySize = sane_size;␊
␉}␊
␊
trunk/i386/libsaio/cpu.c
613613
614614
615615
616
617
618
616619
617620
618621
␉␉␉␉␉p->CPU.NoThreads␉= (uint32_t)bitfield((uint32_t)msr, 15, 0);␊
␉␉␉␉␉break;␊
␉␉␉␉case CPUID_MODEL_ATOM_3700:␊
␉␉␉␉␉p->CPU.NoCores␉␉= 4;␊
␉␉␉␉␉p->CPU.NoThreads␉= 4;␊
␉␉␉␉␉break;␊
␉␉␉␉case CPUID_MODEL_ATOM:␊
␉␉␉␉␉p->CPU.NoCores␉␉= 2;␊
␉␉␉␉␉p->CPU.NoThreads␉= 2;␊
trunk/i386/boot2/drivers.c
176176
177177
178178
179
180
179181
180182
181183
......
254256
255257
256258
257
259
258260
259261
260262
␉␉return 0;␊
␉}␊
␊
␉// ========================================␊
␊
␉// Load extra drivers if a hook has been installed.␊
␉if (LoadExtraDrivers_p != NULL)␊
␉{␊
␉␉␉{␊
␉␉␉␉verbose("Attempting to loading drivers from standard repositories:\n");␊
␊
␉␉␉␉if ( (gMacOSVersion[3] == '9') || ((gMacOSVersion[3] == '1') && ((gMacOSVersion[4] == '0') || gMacOSVersion[4] == '1' ) )) // issue 352␊
␉␉␉␉if ( (gMacOSVersion[3] == '9') || ((gMacOSVersion[3] == '1') && ((gMacOSVersion[4] == '0') || (gMacOSVersion[4] == '1') || (gMacOSVersion[4] == '2') ) )) // issue 352␊
␉␉␉␉{␊
␉␉␉␉␉verbose("\t- Third party extensions search path: /Library/Extensions\n");␊
␉␉␉␉␉strlcpy(gExtensionsSpec, dirSpec, 4087); /* 4096 - sizeof("Library/") mean 4096 - 9 = 4087 */␊
trunk/i386/boot2/boot.c
208208
209209
210210
211
211
212212
213213
214214
......
408408
409409
410410
411
411
412412
413413
414414
......
863863
864864
865865
866
866
867867
868868
869869
870870
871871
872
872873
873874
874875
␉␉bootArgs->flags␉␉|= kBootArgsFlagCSRActiveConfig;␊
␊
␉␉// Set limit to 7bit␊
␉␉if ( getIntForKey(KCsrActiveConfig, &csrValue, &bootInfo->chameleonConfig) && (csrValue >= 0 && csrValue <= 127) )␊
␉␉if ( getIntForKey(kCsrActiveConfig, &csrValue, &bootInfo->chameleonConfig) && (csrValue >= 0 && csrValue <= 127) )␊
␉␉{␊
␉␉␉bootArgs->csrActiveConfig␉= csrValue;␊
␉␉}␊
␉␉␉// Yosemite and El Capitan prelink kernel cache file␊
␉␉␉// for 10.10 10.11␊
␉␉␉snprintf(kernelCacheFile, sizeof(kernelCacheFile), "%sprelinkedkernel", kDefaultCachePathYosemite);␊
␉␉␉verbose("Kernel Cache file path (Mac OS X 10.10 and newer): %s\n", kernelCacheFile);␊
␉␉␉verbose("Kernel Cache file path (OS X 10.10 and newer): %s\n", kernelCacheFile);␊
␉␉}␊
␉}␊
␊
␉␉␉// bootFile must start with a / if it not start with a device name␊
␉␉␉if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/')␊
␉␉␉{␊
␉␉␉␉if ( MacOSVerCurrent < MacOSVer2Int("10.10") ) // Micky1979 - Is prior to Yosemite 10.10␊
␉␉␉␉if ( MacOSVerCurrent < MacOSVer2Int("10.10") ) // Mavericks and older␊
␉␉␉␉{␊
␉␉␉␉␉snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading /␊
␉␉␉␉}␊
␉␉␉␉else␊
␉␉␉␉{␊
␉␉␉␉␉// Yosemite and newer␊
␉␉␉␉␉snprintf(bootFile, sizeof(bootFile), kDefaultKernelPathForYos"%s", bootInfo->bootFile); // Yosemite or El Capitan␊
␉␉␉␉}␊
␉␉␉}␊
trunk/i386/boot2/boot.h
188188
189189
190190
191
191
192192
193193
194194
#define kHDAEnabler␉␉␉"HDAEnabler"␉␉␉/* pci_setup.c */␊
#define kHDEFLayoutID␉␉␉"HDEFLayoutID"␉␉␉/* hda.c */␊
#define kHDAULayoutID␉␉␉"HDAULayoutID"␉␉␉/* hda.c */␊
#define KCsrActiveConfig␉␉"CsrActiveConfig"␉␉/* boot.c */␊
#define kCsrActiveConfig␉␉"CsrActiveConfig"␉␉/* boot.c */␊
␊
/* Pike R. Alpha: added this key */␊
#define kBlackMode␉␉␉"BlackMode"␊

Archive Download the corresponding diff file

Revision: 2826