Chameleon

Chameleon Commit Details

Date:2010-08-21 02:23:00 (8 years 11 months ago)
Author:Azimutz
Commit:398
Parents: 397
Message:Globalizing gMacOSVersion. Consolidating system version check on processBootOptions().
Changes:
M/branches/azimutz/CleanCut/i386/libsaio/stringTable.c
M/branches/azimutz/CleanCut/i386/boot2/drivers.c
M/branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c
M/branches/azimutz/CleanCut/i386/boot2/boot.c
M/branches/azimutz/CleanCut/i386/libsaio/fake_efi.c
M/branches/azimutz/CleanCut/i386/boot2/boot.h

File differences

branches/azimutz/CleanCut/i386/libsaio/acpi_patcher.c
9494
9595
9696
97
9897
9998
10099
static chardirSpecDSDT[128] = "";
const char *override_pathname = NULL; // full path to a file.
intlen = 0, fd = 0;
extern char gMacOSVersion;
// Take in account user overriding if it's DSDT only
if (strstr(filename, "DSDT") &&
branches/azimutz/CleanCut/i386/libsaio/stringTable.c
654654
655655
656656
657
658657
659658
660659
const char*override_pathname = NULL;
const char*filename = "com.apple.Boot.plist";
int count, ret, fd, len = 0;
extern char gMacOSVersion;
// Take in account user overriding the override :P
if (getValueForKey(kTestConfigKey, &override_pathname, &len, &bootInfo->bootConfig))
branches/azimutz/CleanCut/i386/libsaio/fake_efi.c
629629
630630
631631
632
633632
634633
635634
chardirSpecSMBIOS[128] = "";
const char *override_pathname = NULL;
intlen = 0, fd = 0;
extern char gMacOSVersion;
extern void scan_mem();
// Take in account user overriding
branches/azimutz/CleanCut/i386/boot2/boot.c
348348
349349
350350
351
352
353
354351
355352
356353
......
398395
399396
400397
401
402
403
404
405
406
407
408
409
410
411
412
413
414398
415399
416400
......
497481
498482
499483
500
484
501485
502486
503487
bool tryresumedefault;
bool forceresume;
config_file_t systemVersion;// system.plist of booting partition
char osxVersion[8]; // replaces gMacOSVersion here, for now.
// additional variable for testing alternate kernel image locations on boot helper partitions.
char bootFileSpec[512];
}
// Other status (e.g. 0) means that we should proceed with boot.
// Found and loaded a config file. Proceed with boot.
//Azi: still calling this here. The call on processBootOptions() gets hidden from verbose and
// for some reason gMacOSVersion doesn't get initialized on boot.c like on the others. Later...
// Find out which version mac os we're booting.
if (!loadConfigFile("System/Library/CoreServices/SystemVersion.plist", &systemVersion)) {
if (getValueForKey(kProductVersion, &val, &len, &systemVersion)) {
// getValueForKey uses const char for val
// so copy it and trim
strncpy(osxVersion, val, MIN(len, 4));
osxVersion[MIN(len, 4)] = '\0';
}
}
// If cpu doesn't handle 64 bit instructions,...
if (!platformCPUFeature(CPU_FEATURE_EM64T) ||
(gMKextName[0] == '\0') &&
(gBootKernelCacheFile[0] != '\0'));
verbose("Loading Darwin %s\n", osxVersion);
verbose("Loading Darwin %s\n", gMacOSVersion);
if (trycache) do {
branches/azimutz/CleanCut/i386/boot2/boot.h
125125
126126
127127
128
128129
129130
130131
extern bool gOverrideKernel;
//extern char *gPlatformName; disabled
extern char gMKextName[];
extern char gMacOSVersion[];
extern char gRootDevice[];
extern bool gEnableCDROMRescan;
extern bool gScanSingleDrive;
branches/azimutz/CleanCut/i386/boot2/drivers.c
160160
161161
162162
163
163
164164
165165
166
167166
168167
169168
long LoadDrivers( char * dirSpec )
{
char dirSpecExtra[128];
chardirSpecExtra[128];
const char *override_pathfolder = NULL; // full path to a folder.
intfd = 0, len = 0;
extern char gMacOSVersion;
if ( InitDriverSupport() != 0 )
return 0;

Archive Download the corresponding diff file

Revision: 398