Chameleon

Chameleon Commit Details

Date:2017-02-02 19:53:26 (7 years 2 months ago)
Author:ErmaC
Commit:2847
Parents: 2846
Message:sync Chameleon Trunk with Enoch Branch
Changes:
M/trunk/i386/boot2/drivers.c
M/trunk/i386/libsaio/hda.h
M/trunk/i386/libsaio/acpi_patcher.c
M/trunk/i386/boot2/boot.c
M/trunk/i386/libsaio/disk.c
M/trunk/i386/libsaio/hda.c
M/trunk/i386/libsaio/ati.c

File differences

trunk/i386/libsaio/acpi_patcher.c
467467
468468
469469
470
471
472
473
474
475
476
477
470478
471479
472480
......
592600
593601
594602
603
604
605
606
607
608
609
610
595611
596612
597613
␊
␉␉␉␉rsdt_entries[i-dropoffset]=rsdt_entries[i];␊
␊
␉␉␉␉// Dropping DMAR (DMA Remapping table) table can fix stuck on "waitForSystemMapper" or "PCI configuration begin" if nothing wokrks except rolling old AppleACPIplatform.kext back. Needs testing with current OEM AppleACPIplatform.kext not with old rolled back one␊
␉␉␉␉if (tableSign(table, "DMAR"))␊
␉␉␉␉{␊
␉␉␉␉␉DBG("\tOEM DMAR table was dropped\n");␊
␉␉␉␉␉dropoffset++;␊
␉␉␉␉␉continue;␊
␉␉␉␉}␊
␊
␉␉␉␉if (drop_ssdt && tableSign(table, "SSDT"))␊
␉␉␉␉{␊
␉␉␉␉␉DBG("\tOEM SSDT tables was dropped\n");␊
␉␉␉␉␉}␊
␉␉␉␉␉xsdt_entries[i - dropoffset] = xsdt_entries[i];␊
␊
␉␉␉␉␉// Dropping DMAR (DMA Remapping table) table can fix stuck on "waitForSystemMapper" or "PCI configuration begin" if nothing wokrks except rolling old AppleACPIplatform.kext back. Needs testing with current OEM AppleACPIplatform.kext not with old rolled back one␊
␉␉␉␉␉if (tableSign(table, "DMAR"))␊
␉␉␉␉␉{␊
␉␉␉␉␉␉DBG("\tOEM DMAR table was dropped\n");␊
␉␉␉␉␉␉dropoffset++;␊
␉␉␉␉␉␉continue;␊
␉␉␉␉␉}␊
␊
␉␉␉␉␉if (drop_ssdt && tableSign(table, "SSDT"))␊
␉␉␉␉␉{␊
␉␉␉␉␉␉DBG("\tOEM SSDT tables was dropped\n");␊
trunk/i386/libsaio/hda.c
335335
336336
337337
338
338339
339340
340341
␉{ HDA_CODEC_ALC898, 0, "ALC898" },␊
//␉{ HDA_CODEC_ALC899, 0,␉␉"ALC899" },␊
␉{ HDA_CODEC_ALC900, 0, "ALC1150" },␊
␉{ HDA_CODEC_ALC1220, 0, "ALC1220" },␊
␊
␉{ HDA_CODEC_AD1882, 0, "AD1882" },␊
␉{ HDA_CODEC_AD1882A, 0, "AD1882A" },␊
trunk/i386/libsaio/hda.h
456456
457457
458458
459
459460
460461
461462
//#define HDA_CODEC_ALC898 HDA_CODEC_CONSTRUCT(REALTEK, 0x0898)␊
//#define HDA_CODEC_ALC899 HDA_CODEC_CONSTRUCT(REALTEK, 0x0899)␊
#define HDA_CODEC_ALC900 HDA_CODEC_CONSTRUCT(REALTEK, 0x0900)␊
#define HDA_CODEC_ALC1220 HDA_CODEC_CONSTRUCT(REALTEK, 0x1220)␊
#define HDA_CODEC_ALCXXXX HDA_CODEC_CONSTRUCT(REALTEK, 0xffff)␊
␊
/* Motorola */␊
trunk/i386/libsaio/ati.c
22032203
22042204
22052205
2206
2206
22072207
22082208
22092209
void get_vram_size(void)␊
{␊
␉ati_chip_family_t chip_family = card->info->chip_family;␊
␉␊
␊
␉card->vram_size = 0;␊
␊
␉if (chip_family >= CHIP_FAMILY_CEDAR)␊
trunk/i386/libsaio/disk.c
17101710
17111711
17121712
1713
1713
17141714
17151715
17161716
␉char *MavPattern = "Install%20OS%20X%20Mavericks";␊
␉char *YosPattern = "Install%20OS%20X%20Yosemite";␊
␉char *ECPattern = "Install%20OS%20X%20El%20Capitan";␊
␉char *SierraPattern = "Install%10.12";␊
␉char *SierraPattern = "Install%20macOS%20Sierra";␊
␊
␉/*␊
␉ * Only look for OS Version on HFS+␊
trunk/i386/boot2/drivers.c
11551155
11561156
11571157
1158
1158
1159
1160
1161
1162
1163
11591164
11601165
11611166
1162
1163
1167
1168
11641169
11651170
11661171
......
12151220
12161221
12171222
1223
1224
1225
1226
12181227
1219
1228
12201229
12211230
12221231
␉␉␉␉switch (gDarwinMinor)␊
␉␉␉␉{␊
␉␉␉␉␉case 0: kernelOSVer = 0xA0C0000; break;␊
␉␉␉␉␉default:kernelOSVer = 0xA0C0000; break; //Last known kernel (add here updates)␊
␉␉␉␉␉case 1: kernelOSVer = 0xA0C0100; break;␊
␉␉␉␉␉case 2: kernelOSVer = 0xA0C0200; break;␊
␉␉␉␉␉case 3: kernelOSVer = 0xA0C0200; break;␊
␉␉␉␉␉case 4: kernelOSVer = 0xA0C0300; break;␊
␉␉␉␉␉case 5: kernelOSVer = 0xA0C0400; break;␊
␉␉␉␉␉default:kernelOSVer = 0xA0C0400; break; //Last known kernel (add here updates)␊
␉␉␉␉}␊
␉␉␉␉break;␊
␉␉␉default:␊
␉␉␉␉kernelOSVer = 0xA0B0100;␊
␉␉␉␉break; //Last known kernel␊
␉␉␉␉kernelOSVer = 0xA0C0400;␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉}␊
␉␉else␊
␉␉␉case 0xA0B0600: gDarwinMajor = 15; gDarwinMinor = 6; gDarwinRev = 0; break; // 10.11.6␊
␉␉␉// Sierra␊
␉␉␉case 0xA0C0000: gDarwinMajor = 16; gDarwinMinor = 0; gDarwinRev = 0; break; // 10.12␊
␉␉␉case 0xA0C0100: gDarwinMajor = 16; gDarwinMinor = 1; gDarwinRev = 0; break; // 10.12.1␊
␉␉␉case 0xA0C0200: gDarwinMajor = 16; gDarwinMinor = 3; gDarwinRev = 0; break; // 10.12.2␊
␉␉␉case 0xA0C0300: gDarwinMajor = 16; gDarwinMinor = 4; gDarwinRev = 0; break; // 10.12.3␊
␉␉␉case 0xA0C0400: gDarwinMajor = 16; gDarwinMinor = 5; gDarwinRev = 0; break; // 10.12.4␊
␉␉␉// default = last known kernel␊
␉␉␉default: gDarwinMajor = 16; gDarwinMinor = 0; gDarwinRev = 0; break; // 10.12;␊
␉␉␉default: gDarwinMajor = 16; gDarwinMinor = 5; gDarwinRev = 0; break; // 10.12.4;␊
␉␉}␊
␉}␊
␊
trunk/i386/boot2/boot.c
164164
165165
166166
167
167
168168
169169
170170
␊
␉gMacOSVersion[0] = 0;␊
␉// TODO identify sierra as macOS␊
␉verbose("Booting on %s %s (%s)\n", (MacOSVerCurrent < MacOSVer2Int("10.8")) ? "Mac OS X" : "OS X", gBootVolume->OSFullVer, gBootVolume->OSBuildVer );␊
␉verbose("Booting on %s %s (%s)\n", (MacOSVerCurrent < MacOSVer2Int("10.8")) ? "Mac OS X" : (MacOSVerCurrent < MacOSVer2Int("10.12")) ? "OS X" : "macOS", gBootVolume->OSFullVer, gBootVolume->OSBuildVer );␊
␊
␉setupBooterArgs();␊
␊

Archive Download the corresponding diff file

Revision: 2847