Chameleon Commit Details - 2456 - Chameleon open source boot loader project.

Date:

2014-10-30 17:44:46 (9 years 5 months ago)

Author:

ErmaC

Commit:

2456

Parents:

2455

Message:

- Update Chameleon.xcodeproj - (re)enable klibc module - Typos - Merge part of bitshoveler commits : Remove "-x" option from "ld" command which breaks build under newer Xcode versions, comment out some unused functions by expanding "#if UNUSED" conditional, comment out unused static functions, which cause build to fail in "release" mode, fix null pointer handling, only write terminating null char if malloc succeeded, fix memory leak.

Changes:

M	/trunk/i386/modules/klibc/Cconfig
M	/trunk/i386/boot2/picopng.c
M	/trunk/i386/libsaio/gma.c
M	/trunk/i386/boot2/boot.c
M	/trunk/i386/modules/klibc/strndup.c
M	/trunk/i386/libsaio/nvidia.c
M	/trunk/CHANGES
M	/trunk/i386/libsaio/vbe.c
M	/trunk/package/OptionalSettings/PowerManagement.txt
M	/trunk/i386/libsaio/stringTable.c
M	/trunk/i386/libsaio/hfs.c
M	/trunk/package/Resources/templates/Localizable.strings
M	/trunk/i386/boot2/drivers.c
M	/trunk/i386/libsaio/acpi_patcher.c
M	/trunk/Chameleon.xcodeproj/project.pbxproj
M	/trunk/i386/libsaio/bootargs.h
M	/trunk/i386/boot2/gui.c
M	/trunk/i386/libsaio/cpu.c
M	/trunk/i386/modules/MakeInc.dir
M	/trunk/i386/libsaio/smbios_getters.c
M	/trunk/i386/libsaio/disk.c
M	/trunk/i386/libsaio/device_inject.c
M	/trunk/i386/util/bdmesg.c
M	/trunk/i386/libsaio/hda.c
M	/trunk/i386/libsaio/smbios.c

File differences

-33
34 34
35 35
36
37
36 38
37 39
38 40
... ...
69 71
70 72
71 73
74
75
72 76
73 77
74 78
+␊
static biosBuf_t bb;␊
␊
#if UNUSED␊
␊
//==============================================================================␊
#if UNUSED␊
static inline void␊

#endif /* UNUSED */␊
//==============================================================================␊
␊
#endif /* UNUSED */␊
␊
int getVBEInfo( void * infoBlock )␊
{␊
    bb.intno  = 0x10;␊
 ...
 ␊
 static biosBuf_t bb;␊
 ␊
+#if UNUSED␊
+␊
 //==============================================================================␊
 #if UNUSED␊
 static inline void␊
 #endif /* UNUSED */␊
 //==============================================================================␊
 ␊
+#endif /* UNUSED */␊
+␊
 int getVBEInfo( void * infoBlock )␊
 {␊
     bb.intno  = 0x10;␊

-271
272 272
273 273
274 
274
275
275 276
276 277
277 278
278 
279
280
279 281
280 282
281 283
... ...
294 296
295 297
296 298
297 
299
300
298 301
299 302
300 303
... ...
306 309
307 310
308 311
309 
312
313
310 314
311 315
312 316
... ...
319 323
320 324
321 325
322 
326
327
323 328
324 329
325 330
+␊
␉while(i < string->numentries)␊
␉{␊
␉        if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES)) {␊
␉        if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES))␊
␉␉{␊
␉            break;␊
␉        }␊
␊
␉        if(!len) {␊
␉        if(!len)␊
␉␉{␊
␉            break;␊
␉        }␊
␊

␉␉len -= 24;␊
␉␉for(x = 0;x < string->entries[i]->num_pci_devpaths; x++)␊
␉␉{␊
␉␉␉if(!len) {␊
␉␉␉if(!len)␊
␉␉␉{␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉␉snprintf(buffer, len, "%02x%02x%04x%02x%02x", string->entries[i]->pci_dev_path[x].type,␊

␉␉␉len -= 12;␊
␉␉}␊
␊
␉␉if(!len) {␊
␉␉if(!len)␊
␉␉{␊
␉␉␉break;␊
␉␉}␊
␊

␉␉uint8_t *dataptr = string->entries[i]->data;␊
␉␉for(x = 0; (uint32_t)x < (string->entries[i]->length) - (24 + (6 * string->entries[i]->num_pci_devpaths)) ; x++)␊
␉␉{␊
␉␉␉if(!len) {␊
␉␉␉if(!len)␊
␉␉␉{␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉␉snprintf(buffer, len, "%02x", *dataptr++);␊
 ...
 ...
 ...
 ␊
 ␉while(i < string->numentries)␊
 ␉{␊
-␉        if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES)) {␊
+␉        if (!(i < DEV_PROP_DEVICE_MAX_ENTRIES))␊
+␉␉{␊
 ␉            break;␊
 ␉        }␊
 ␊
-␉        if(!len) {␊
+␉        if(!len)␊
+␉␉{␊
 ␉            break;␊
 ␉        }␊
 ␊
 ␉␉len -= 24;␊
 ␉␉for(x = 0;x < string->entries[i]->num_pci_devpaths; x++)␊
 ␉␉{␊
-␉␉␉if(!len) {␊
+␉␉␉if(!len)␊
+␉␉␉{␊
 ␉␉␉␉break;␊
 ␉␉␉}␊
 ␉␉␉snprintf(buffer, len, "%02x%02x%04x%02x%02x", string->entries[i]->pci_dev_path[x].type,␊
 ␉␉␉len -= 12;␊
 ␉␉}␊
 ␊
-␉␉if(!len) {␊
+␉␉if(!len)␊
+␉␉{␊
 ␉␉␉break;␊
 ␉␉}␊
 ␊
 ␉␉uint8_t *dataptr = string->entries[i]->data;␊
 ␉␉for(x = 0; (uint32_t)x < (string->entries[i]->length) - (24 + (6 * string->entries[i]->num_pci_devpaths)) ; x++)␊
 ␉␉{␊
-␉␉␉if(!len) {␊
+␉␉␉if(!len)␊
+␉␉␉{␊
 ␉␉␉␉break;␊
 ␉␉␉}␊
 ␉␉␉snprintf(buffer, len, "%02x", *dataptr++);␊

-1566
1567 1567
1568 1568
1569 
1569
1570
1571
1572
1573
1574
1575
1570 1576
1571 1577
1572 1578
... ...
1793 1799
1794 1800
1795 1801
1796 
1797 1802
1798 1803
1799 1804
... ...
1968 1973
1969 1974
1970 1975
1971 
1972 1976
1973 1977
1974 1978
... ...
2013 2017
2014 2018
2015 2019
2020
2016 2021
2017 2022
2018 2023
... ...
2020 2025
2021 2026
2022 2027
2028
2023 2029
2024 2030
2025 2031
... ...
2055 2061
2056 2062
2057 2063
2058 
2064
2059 2065
2060 2066
2061 2067
+␊
static int patch_nvidia_rom(uint8_t *rom)␊
{␊
␉if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa)) {␊
␉if (!rom)␊
␉{␊
␉␉printf("ROM not found\n");␊
␉␉return PATCH_ROM_FAILED;␊
␉}␊
␉if (rom[0] != 0x55 && rom[1] != 0xaa)␊
␉{␊
␉␉printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]);␊
␉␉return PATCH_ROM_FAILED;␊
␉}␊

␉␉for (i = 0; i < (sizeof(nvidia_card_exceptions) / sizeof(nvidia_card_exceptions[0])); i++) {␊
␉␉␉if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id))␉{␊
␉␉␉␉return nvidia_card_exceptions[i].name;␊
␉␉␉␉break;␊
␉␉␉}␊
␉␉}␊
␉}␊

␉option_rom_pci_header_t␉␉*rom_pci_header;␊
␉volatile uint8_t␉␉*regs;␊
␉uint8_t␉␉␉␉*rom = NULL;␊
␉uint8_t␉␉␉␉*nvRom;␊
␉uint8_t␉␉␉␉nvCardType = 0;␊
␉unsigned long long␉␉videoRam = 0;␊
␉uint32_t␉␉␉nvBiosOveride;␊

␉␉␉return false;␊
␉␉}␊
␉} else {␊
␉␉uint8_t␉*nvRom;␊
␉␉rom = malloc(NVIDIA_ROM_SIZE);␊
␉␉// Otherwise read bios from card␊
␉␉nvBiosOveride = 0;␊

␉␉// PROM first␊
␉␉// Enable PROM access␊
␉␉(REG32(NV_PBUS_PCI_NV_20)) = NV_PBUS_PCI_NV_20_ROM_SHADOW_DISABLED;␊
␊
␉␉nvRom = (uint8_t*)&regs[NV_PROM_OFFSET];␊
␊
␉␉// Valid Signature ?␊

␉if ((nvPatch = patch_nvidia_rom(rom)) == PATCH_ROM_FAILED) {␊
␉␉printf("ERROR: nVidia ROM Patching Failed!\n");␊
␉␉free(rom);␊
␉␉//return false;␊
␉␉return false;␊
␉}␊
␊
␉rom_pci_header = (option_rom_pci_header_t*)(rom + *(uint16_t *)&rom[24]);␊
 ...
 ...
 ...
 ...
 ...
 ␊
 static int patch_nvidia_rom(uint8_t *rom)␊
 {␊
-␉if (!rom || (rom[0] != 0x55 && rom[1] != 0xaa)) {␊
+␉if (!rom)␊
+␉{␊
+␉␉printf("ROM not found\n");␊
+␉␉return PATCH_ROM_FAILED;␊
+␉}␊
+␉if (rom[0] != 0x55 && rom[1] != 0xaa)␊
+␉{␊
 ␉␉printf("False ROM signature: 0x%02x%02x\n", rom[0], rom[1]);␊
 ␉␉return PATCH_ROM_FAILED;␊
 ␉}␊
 ␉␉for (i = 0; i < (sizeof(nvidia_card_exceptions) / sizeof(nvidia_card_exceptions[0])); i++) {␊
 ␉␉␉if ((nvidia_card_exceptions[i].device == device_id) && (nvidia_card_exceptions[i].subdev == subsys_id))␉{␊
 ␉␉␉␉return nvidia_card_exceptions[i].name;␊
-␉␉␉␉break;␊
 ␉␉␉}␊
 ␉␉}␊
 ␉}␊
 ␉option_rom_pci_header_t␉␉*rom_pci_header;␊
 ␉volatile uint8_t␉␉*regs;␊
 ␉uint8_t␉␉␉␉*rom = NULL;␊
-␉uint8_t␉␉␉␉*nvRom;␊
 ␉uint8_t␉␉␉␉nvCardType = 0;␊
 ␉unsigned long long␉␉videoRam = 0;␊
 ␉uint32_t␉␉␉nvBiosOveride;␊
 ␉␉␉return false;␊
 ␉␉}␊
 ␉} else {␊
+␉␉uint8_t␉*nvRom;␊
 ␉␉rom = malloc(NVIDIA_ROM_SIZE);␊
 ␉␉// Otherwise read bios from card␊
 ␉␉nvBiosOveride = 0;␊
 ␉␉// PROM first␊
 ␉␉// Enable PROM access␊
 ␉␉(REG32(NV_PBUS_PCI_NV_20)) = NV_PBUS_PCI_NV_20_ROM_SHADOW_DISABLED;␊
+␊
 ␉␉nvRom = (uint8_t*)&regs[NV_PROM_OFFSET];␊
 ␊
 ␉␉// Valid Signature ?␊
 ␉if ((nvPatch = patch_nvidia_rom(rom)) == PATCH_ROM_FAILED) {␊
 ␉␉printf("ERROR: nVidia ROM Patching Failed!\n");␊
 ␉␉free(rom);␊
-␉␉//return false;␊
+␉␉return false;␊
 ␉}␊
 ␊
 ␉rom_pci_header = (option_rom_pci_header_t*)(rom + *(uint16_t *)&rom[24]);␊

-705
706 706
707 707
708 
709 708
710 709
711 710
... ...
730 729
731 730
732 731
732
733 733
734 734
735 735
+␊
␉␉␉␉␉␉␉case CPU_MODEL_SANDYBRIDGE:␉␉␉// Intel Core i3, i5, i7 LGA1155 (32nm)␊
␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE:␉␉␉// Intel Core i3, i5, i7 LGA1155 (22nm)␊
␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE_XEON:␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.version         = kDefaultiMacSandyBIOSVersion;␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.releaseDate     = kDefaultiMacSandyBIOSReleaseDate;␊
␉␉␉␉␉␉␉␉defaultSystemInfo.productName␉= kDefaultiMacSandy;␊

␉␉␉␉␉␉␉case CPU_MODEL_WESTMERE:␉␉// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core␊
␉␉␉␉␉␉␉case CPU_MODEL_WESTMERE_EX:␉␉// Intel Xeon E7␊
␉␉␉␉␉␉␉case CPU_MODEL_JAKETOWN:␉␉// Intel Core i7, Xeon E5 LGA2011 (32nm)␊
␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE_XEON:␉␉// Intel Core i7, Xeon E5 v2 LGA2011 (22nm)␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.version␉␉= kDefaultMacProWestmereBIOSVersion;␊
␉␉␉␉␉␉␉␉defaultBIOSInfo.releaseDate␉= kDefaultMacProWestmereBIOSReleaseDate;␊
␉␉␉␉␉␉␉␉defaultSystemInfo.productName␉= kDefaultMacProWestmere;␊
 ...
 ␊
 ␉␉␉␉␉␉␉case CPU_MODEL_SANDYBRIDGE:␉␉␉// Intel Core i3, i5, i7 LGA1155 (32nm)␊
 ␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE:␉␉␉// Intel Core i3, i5, i7 LGA1155 (22nm)␊
-␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE_XEON:␊
 ␉␉␉␉␉␉␉␉defaultBIOSInfo.version         = kDefaultiMacSandyBIOSVersion;␊
 ␉␉␉␉␉␉␉␉defaultBIOSInfo.releaseDate     = kDefaultiMacSandyBIOSReleaseDate;␊
 ␉␉␉␉␉␉␉␉defaultSystemInfo.productName␉= kDefaultiMacSandy;␊
 ␉␉␉␉␉␉␉case CPU_MODEL_WESTMERE:␉␉// Intel Core i7, Xeon X56xx, Xeon E56xx, Xeon W36xx LGA1366 (32nm) 6 Core␊
 ␉␉␉␉␉␉␉case CPU_MODEL_WESTMERE_EX:␉␉// Intel Xeon E7␊
 ␉␉␉␉␉␉␉case CPU_MODEL_JAKETOWN:␉␉// Intel Core i7, Xeon E5 LGA2011 (32nm)␊
+␉␉␉␉␉␉␉case CPU_MODEL_IVYBRIDGE_XEON:␉␉// Intel Core i7, Xeon E5 v2 LGA2011 (22nm)␊
 ␉␉␉␉␉␉␉␉defaultBIOSInfo.version␉␉= kDefaultMacProWestmereBIOSVersion;␊
 ␉␉␉␉␉␉␉␉defaultBIOSInfo.releaseDate␉= kDefaultMacProWestmereBIOSReleaseDate;␊
 ␉␉␉␉␉␉␉␉defaultSystemInfo.productName␉= kDefaultMacProWestmere;␊

-592
593 593
594 594
595 
595
596
596 597
597 598
598 599
... ...
619 620
620 621
621 622
622 
623 
623
624
625
626
624 627
625 628
626 629
... ...
656 659
657 660
658 661
659 
660 
662
663
664
665
661 666
662 667
663 
668
669
670
664 671
665 672
666 
673
674
675
667 676
668 677
669 678
670 
679
680
671 681
672 682
673 683
674 
684
685
675 686
676 687
677 688
... ...
691 702
692 703
693 704
694 
705
706
695 707
696 708
697 709
... ...
726 738
727 739
728 740
729 
730 
741
742
743
744
731 745
732 746
733 747
... ...
744 758
745 759
746 760
747 
761
762
748 763
749 
764
765
766
750 767
751 768
752 769
... ...
764 781
765 782
766 783
767 
784
785
768 786
769 787
770 788
771 789
772 790
773 791
774 
792
793
775 794
776 795
777 796
+{␊
␉int fd, count;␊
␊
␉if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0) {␊
␉if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0)␊
␉{␊
␉␉return -1;␊
␉}␊
␉// read file␊

␊
␉int i, fd, count, ret=-1;␊
␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
␉␉if ((fd = open(dirspec[i], 0)) >= 0) {␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
␉{␊
␉␉if ((fd = open(dirspec[i], 0)) >= 0)␊
␉␉{␊
␉␉␉// read file␊
␉␉␉count = read(fd, config->plist, IO_CONFIG_DATA_SIZE);␊
␉␉␉close(fd);␊

␊
␉int i;␊
␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
␉␉if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 ) {␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
␉{␊
␉␉if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 )␊
␉␉{␊
␉␉␉return 0;␊
␉␉}␊
␉␉if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 ) {␊
␊
␉␉if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 )␊
␉␉{␊
␉␉␉return 0;␊
␉␉}␊
␉␉if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 ) {␊
␊
␉␉if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 )␊
␉␉{␊
␉␉␉return 0;␊
␉␉}␊
␉␉BVRef bvr;␊
␉␉for ( bvr = chain; bvr; bvr = bvr->next ) { /* C99 Error */␊
␉␉for ( bvr = chain; bvr; bvr = bvr->next ) /* C99 Error */␊
␉␉{␊
␉␉␉char device[256];␊
␉␉␉getDeviceDescription(bvr, device);␊
␊
␉␉␉if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 ) {␊
␉␉␉if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 )␊
␉␉␉{␊
␉␉␉␉return 0;␊
␉␉␉}␊
␉␉}␊

␊
␉snprintf(full_path, sizeof(full_path), "%s%s", device, path);␊
␊
␉if ((fd = open(full_path, 0)) >= 0) {␊
␉if ((fd = open(full_path, 0)) >= 0)␊
␉{␊
␉␉// Check for depreciated file names and annoy the user about it.␊
␉␉if(strstr(full_path, "com.apple.Boot.plist")) {␊
␉␉␉printf("%s is depreciated.\n", full_path);␊

␊
␉int i, fd, count, ret=-1;␊
␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
␉␉if ((fd = open(dirspec[i], 0)) >= 0) {␊
␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
␉{␊
␉␉if ((fd = open(dirspec[i], 0)) >= 0)␊
␉␉{␊
␉␉␉// read file␊
␉␉␉count = read(fd, config->plist, IO_CONFIG_DATA_SIZE);␊
␉␉␉close(fd);␊

␊
char * newString(const char * oldString)␊
{␊
␉if ( oldString ) {␊
␉if ( oldString )␊
␉{␊
␉␉return strcpy(malloc(strlen(oldString)+1), oldString);␊
␉} else {␊
␉}␊
␉else␊
␉{␊
␉␉return NULL;␊
␉}␊
}␊

␉*val = '\0';␊
␊
␉// Scan for the next non-whitespace character.␊
␉while ( *ptr && (*ptr == ' ' || *ptr == '=') ) {␊
␉while ( *ptr && (*ptr == ' ' || *ptr == '=') )␊
␉{␊
␉␉ptr++;␊
␉}␊
  ␊
␉strStart = ptr;␊
␊
␉// Skip the leading double quote character.␊
␉if (*ptr == '\"') {␊
␉if (*ptr == '\"')␊
␉{␊
␉␉isQuoted = true;␊
␉␉ptr++;␊
␉␉strStart++;␊
 ...
 ...
 ...
 ...
 ...
 ...
 {␊
 ␉int fd, count;␊
 ␊
-␉if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0) {␊
+␉if ((fd = open_bvdev("bt(0,0)", configFile, 0)) < 0)␊
+␉{␊
 ␉␉return -1;␊
 ␉}␊
 ␉// read file␊
 ␊
 ␉int i, fd, count, ret=-1;␊
 ␊
-␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
-␉␉if ((fd = open(dirspec[i], 0)) >= 0) {␊
+␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
+␉{␊
+␉␉if ((fd = open(dirspec[i], 0)) >= 0)␊
+␉␉{␊
 ␉␉␉// read file␊
 ␉␉␉count = read(fd, config->plist, IO_CONFIG_DATA_SIZE);␊
 ␉␉␉close(fd);␊
 ␊
 ␉int i;␊
 ␊
-␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
-␉␉if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 ) {␊
+␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
+␉{␊
+␉␉if ( loadChameleonConfigForDevice(config, "rd(0,0)", dirspec[i]) == 0 )␊
+␉␉{␊
 ␉␉␉return 0;␊
 ␉␉}␊
-␉␉if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 ) {␊
+␊
+␉␉if ( loadChameleonConfigForDevice(config, "", dirspec[i]) == 0 )␊
+␉␉{␊
 ␉␉␉return 0;␊
 ␉␉}␊
-␉␉if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 ) {␊
+␊
+␉␉if ( loadChameleonConfigForDevice(config, "bt(0,0)", dirspec[i]) == 0 )␊
+␉␉{␊
 ␉␉␉return 0;␊
 ␉␉}␊
 ␉␉BVRef bvr;␊
-␉␉for ( bvr = chain; bvr; bvr = bvr->next ) { /* C99 Error */␊
+␉␉for ( bvr = chain; bvr; bvr = bvr->next ) /* C99 Error */␊
+␉␉{␊
 ␉␉␉char device[256];␊
 ␉␉␉getDeviceDescription(bvr, device);␊
 ␊
-␉␉␉if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 ) {␊
+␉␉␉if ( loadChameleonConfigForDevice(config, device, dirspec[i]) == 0 )␊
+␉␉␉{␊
 ␉␉␉␉return 0;␊
 ␉␉␉}␊
 ␉␉}␊
 ␊
 ␉snprintf(full_path, sizeof(full_path), "%s%s", device, path);␊
 ␊
-␉if ((fd = open(full_path, 0)) >= 0) {␊
+␉if ((fd = open(full_path, 0)) >= 0)␊
+␉{␊
 ␉␉// Check for depreciated file names and annoy the user about it.␊
 ␉␉if(strstr(full_path, "com.apple.Boot.plist")) {␊
 ␉␉␉printf("%s is depreciated.\n", full_path);␊
 ␊
 ␉int i, fd, count, ret=-1;␊
 ␊
-␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++) {␊
-␉␉if ((fd = open(dirspec[i], 0)) >= 0) {␊
+␉for(i = 0; i< sizeof(dirspec)/sizeof(dirspec[0]); i++)␊
+␉{␊
+␉␉if ((fd = open(dirspec[i], 0)) >= 0)␊
+␉␉{␊
 ␉␉␉// read file␊
 ␉␉␉count = read(fd, config->plist, IO_CONFIG_DATA_SIZE);␊
 ␉␉␉close(fd);␊
 ␊
 char * newString(const char * oldString)␊
 {␊
-␉if ( oldString ) {␊
+␉if ( oldString )␊
+␉{␊
 ␉␉return strcpy(malloc(strlen(oldString)+1), oldString);␊
-␉} else {␊
+␉}␊
+␉else␊
+␉{␊
 ␉␉return NULL;␊
 ␉}␊
 }␊
 ␉*val = '\0';␊
 ␊
 ␉// Scan for the next non-whitespace character.␊
-␉while ( *ptr && (*ptr == ' ' || *ptr == '=') ) {␊
+␉while ( *ptr && (*ptr == ' ' || *ptr == '=') )␊
+␉{␊
 ␉␉ptr++;␊
 ␉}␊
   ␊
 ␉strStart = ptr;␊
 ␊
 ␉// Skip the leading double quote character.␊
-␉if (*ptr == '\"') {␊
+␉if (*ptr == '\"')␊
+␉{␊
 ␉␉isQuoted = true;␊
 ␉␉ptr++;␊
 ␉␉strStart++;␊

-64
65 65
66 66
67 
68 
67
68
69
70
69 71
70 72
71 73
+␊
bool getSMBOemProcessorBusSpeed(returnType *value)␊
{␊
␉if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) { // Intel␊
␉␉switch (Platform.CPU.Family) {␊
␉if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel␊
␉{␊
␉␉switch (Platform.CPU.Family)␊
␉␉{␊
␉␉␉case 0x06:␊
␉␉␉{␊
␉␉␉␉switch (Platform.CPU.Model) {␊
 ␊
 bool getSMBOemProcessorBusSpeed(returnType *value)␊
 {␊
-␉if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) { // Intel␊
-␉␉switch (Platform.CPU.Family) {␊
+␉if (Platform.CPU.Vendor == CPUID_VENDOR_INTEL) // Intel␊
+␉{␊
+␉␉switch (Platform.CPU.Family)␊
+␉␉{␊
 ␉␉␉case 0x06:␊
 ␉␉␉{␊
 ␉␉␉␉switch (Platform.CPU.Model) {␊

-935
936 936
937 937
938 
938
939
939 940
940 941
941 942
942 943
943 
944
945
944 946
945 947
946 948
+␉vector8_resize(out, numpixels * 4);␊
␉uint8_t *out_data = out->size ? out->data : 0;␊
␉if (bitDepth == 8 && colorType == 0) // greyscale␊
␉␉for (i = 0; i < numpixels; i++) {␊
␉␉for (i = 0; i < numpixels; i++)␊
␉␉{␊
␉␉␉out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[i];␊
␉␉␉out_data[4 * i + 3] = (info->key_defined && (in[i] == info->key_r)) ? 0 : 255;␊
␉␉}␊
␉else if (bitDepth == 8 && colorType == 2) // RGB color␊
␉␉for (i = 0; i < numpixels; i++) {␊
␉␉for (i = 0; i < numpixels; i++)␊
␉␉{␊
␉␉␉for (c = 0; c < 3; c++)␊
␉␉␉␉out_data[4 * i + c] = in[3 * i + c];␊
␉␉␉out_data[4 * i + 3] = (info->key_defined && (in[3 * i + 0] == info->key_r) &&␊
 ␉vector8_resize(out, numpixels * 4);␊
 ␉uint8_t *out_data = out->size ? out->data : 0;␊
 ␉if (bitDepth == 8 && colorType == 0) // greyscale␊
-␉␉for (i = 0; i < numpixels; i++) {␊
+␉␉for (i = 0; i < numpixels; i++)␊
+␉␉{␊
 ␉␉␉out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[i];␊
 ␉␉␉out_data[4 * i + 3] = (info->key_defined && (in[i] == info->key_r)) ? 0 : 255;␊
 ␉␉}␊
 ␉else if (bitDepth == 8 && colorType == 2) // RGB color␊
-␉␉for (i = 0; i < numpixels; i++) {␊
+␉␉for (i = 0; i < numpixels; i++)␊
+␉␉{␊
 ␉␉␉for (c = 0; c < 3; c++)␊
 ␉␉␉␉out_data[4 * i + c] = in[3 * i + c];␊
 ␉␉␉out_data[4 * i + 3] = (info->key_defined && (in[3 * i + 0] == info->key_r) &&␊

-126
127 127
128 128
129 
129
130 130
131 131
132 132
+␉@ld -arch i386 \␊
␉-alias _$(MODULE_START) start \␊
␉-dylib -read_only_relocs suppress \␊
␉-S -x -Z -dead_strip_dylibs \␊
␉-S -Z -dead_strip_dylibs \␊
␉-no_uuid \␊
␉-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \␊
␉-final_output $(MODULE_NAME) \␊
 ␉@ld -arch i386 \␊
 ␉-alias _$(MODULE_START) start \␊
 ␉-dylib -read_only_relocs suppress \␊
-␉-S -x -Z -dead_strip_dylibs \␊
+␉-S -Z -dead_strip_dylibs \␊
 ␉-no_uuid \␊
 ␉-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \␊
 ␉-final_output $(MODULE_NAME) \␊

-10
11 11
12 12
13
13 14
14 
15
16
15 17
16 18
+␉char *d = malloc(l);␊
␊
␉if (d)␊
␉{␊
␉␉memcpy(d, s, l);␊
␉d[n] = '\0';␊
␉␉d[n] = '\0';␊
␉}␊
␉return d;␊
}␊
 ␉char *d = malloc(l);␊
 ␊
 ␉if (d)␊
+␉{␊
 ␉␉memcpy(d, s, l);␊
-␉d[n] = '\0';␊
+␉␉d[n] = '\0';␊
+␉}␊
 ␉return d;␊
 }␊

-4
5 5
6 6
7 
7
8 8
9 9
10 10
+␊
config KLIBC_MODULE␊
␉tristate "klibc Module"␊
␉default n␊
␉default m␊
␉---help---␊
␉  Say Y here if you want to enable the use of this module.␊
␊
 ␊
 config KLIBC_MODULE␊
 ␉tristate "klibc Module"␊
-␉default n␊
+␉default m␊
 ␉---help---␊
 ␉  Say Y here if you want to enable the use of this module.␊
 ␊

-30
31 31
32 32
33
34
33 35
34 36
+Bool@EnableC2State:EnableC2State=Yes␊
Bool@EnableC3State:EnableC3State=Yes␊
Bool@EnableC4State:EnableC4State=Yes␊
#Bool@EnableC6State:EnableC6State=Yes␊
#Bool@EnableC7State:EnableC7State=Yes␊
Bool@GenerateCStates:GenerateCStates=Yes␊
Bool@GeneratePStates:GeneratePStates=Yes␊
 Bool@EnableC2State:EnableC2State=Yes␊
 Bool@EnableC3State:EnableC3State=Yes␊
 Bool@EnableC4State:EnableC4State=Yes␊
+#Bool@EnableC6State:EnableC6State=Yes␊
+#Bool@EnableC7State:EnableC7State=Yes␊
 Bool@GenerateCStates:GenerateCStates=Yes␊
 Bool@GeneratePStates:GeneratePStates=Yes␊

-194
195 195
196 196
197
198
199
197 200
198 201
199 202
+"EnableC6State_title" = "EnableC6State=Yes";␊
"EnableC6State_description" = "Enable specific Processor power state, C6.";␊
␊
"EnableC7State_title" = "EnableC7State=Yes";␊
"EnableC7State_description" = "Enable specific Processor power state, C7.";␊
␊
"GenerateCStates_title" = "GenerateCStates=Yes";␊
"GenerateCStates_description" = "Enable auto generation of processor idle sleep states (C-States).";␊
␊
 "EnableC6State_title" = "EnableC6State=Yes";␊
 "EnableC6State_description" = "Enable specific Processor power state, C6.";␊
 ␊
+"EnableC7State_title" = "EnableC7State=Yes";␊
+"EnableC7State_description" = "Enable specific Processor power state, C7.";␊
+␊
 "GenerateCStates_title" = "GenerateCStates=Yes";␊
 "GenerateCStates_description" = "Enable auto generation of processor idle sleep states (C-States).";␊
 ␊

-
2
3
4
5
6
7
8
1 9
2 10
3 11
... ...
22 30
23 31
24 32
25 
33
26 34
27 35
28 36
+- bitshoveler : Remove "-x" option from "ld" command which breaks build under newer Xcode versions (/i386/modules/MakeInc.dir) ␊
- bitshoveler : Comment out some unused functions by expanding "#if UNUSED" conditional (stringTable.c)␊
- bitshoveler : Comment out unused static functions, which cause build to fail in "release" mode (vbe.c)␊
- bitshoveler : Fix null pointer handling (nvidia.c)␊
- bitshoveler : Only write terminating null char if malloc succeeded (strndup.c)␊
- bitshoveler : Fix memory leak (bdmesg.c)␊
- ErmaC : (re)enable klibc module␊
- ErmaC : Merge Recovery Icons(png) courtesy of blackosx␊
- ErmaC : Merge Yosemite patch (ready from June 2014) Thanks all involved in the test and develop;␊
␉␉Special thanks: Alex J, viv xix, zenith432 from http://forge.voodooprojects.org/p/chameleon/issues/375/␊
␉␉Testing and improvements: Pike R. Alpha, ErmaC, Bungo, blackosx, Micky1979, crazybirdy, oldnapalm, janek202, MinusZwei and Andy Vandijck.␊

- meklort : Make compile on gcc w/ errors enabled.␊
- bitshoveler : Remove the '-x' option from the offending 'ld' command␊
- Jief : Makefile dependency missing for boot0 and boot1h␊
- ErmaC :Temp disable klibc module␊
- ErmaC : Temp disable klibc module␊
- meklort : Silence output.␊
- meklort : Add --no-print-directory.␊
- meklort : Replace \t with tab.␊
 ...
+- bitshoveler : Remove "-x" option from "ld" command which breaks build under newer Xcode versions (/i386/modules/MakeInc.dir) ␊
+- bitshoveler : Comment out some unused functions by expanding "#if UNUSED" conditional (stringTable.c)␊
+- bitshoveler : Comment out unused static functions, which cause build to fail in "release" mode (vbe.c)␊
+- bitshoveler : Fix null pointer handling (nvidia.c)␊
+- bitshoveler : Only write terminating null char if malloc succeeded (strndup.c)␊
+- bitshoveler : Fix memory leak (bdmesg.c)␊
+- ErmaC : (re)enable klibc module␊
+- ErmaC : Merge Recovery Icons(png) courtesy of blackosx␊
 - ErmaC : Merge Yosemite patch (ready from June 2014) Thanks all involved in the test and develop;␊
 ␉␉Special thanks: Alex J, viv xix, zenith432 from http://forge.voodooprojects.org/p/chameleon/issues/375/␊
 ␉␉Testing and improvements: Pike R. Alpha, ErmaC, Bungo, blackosx, Micky1979, crazybirdy, oldnapalm, janek202, MinusZwei and Andy Vandijck.␊
 - meklort : Make compile on gcc w/ errors enabled.␊
 - bitshoveler : Remove the '-x' option from the offending 'ld' command␊
 - Jief : Makefile dependency missing for boot0 and boot1h␊
-- ErmaC :Temp disable klibc module␊
+- ErmaC : Temp disable klibc module␊
 - meklort : Silence output.␊
 - meklort : Add --no-print-directory.␊
 - meklort : Replace \t with tab.␊

Download the corresponding diff file