Index: branches/Chimera/version =================================================================== --- branches/Chimera/version (revision 2251) +++ branches/Chimera/version (revision 2252) @@ -1 +1 @@ -2.1.0 +2.1.1 Index: branches/Chimera/i386/libsaio/nvidia.c =================================================================== --- branches/Chimera/i386/libsaio/nvidia.c (revision 2251) +++ branches/Chimera/i386/libsaio/nvidia.c (revision 2252) @@ -1578,6 +1578,8 @@ entries[i+1].type = TYPE_GROUPED; } break; + default: + break; } break; } Index: branches/Chimera/i386/libsaio/smbios_decode.c =================================================================== --- branches/Chimera/i386/libsaio/smbios_decode.c (revision 2251) +++ branches/Chimera/i386/libsaio/smbios_decode.c (revision 2252) @@ -18,6 +18,10 @@ #define DBG(x...) msglog(x) #endif +static SMBWord minorVersion; + +extern char *getSMBStringForField(SMBStructHeader *structHeader, uint8_t field); + static const char * SMBMemoryDeviceTypes[] = { @@ -52,10 +56,6 @@ kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) / sizeof(SMBMemoryDeviceTypes[0]); -static SMBWord minorVersion; - -extern char *getSMBStringForField(SMBStructHeader *structHeader, uint8_t field); - //------------------------------------------------------------------------------------------------------------------------- // BIOSInformation //------------------------------------------------------------------------------------------------------------------------- Index: branches/Chimera/i386/libsaio/fake_efi.c =================================================================== --- branches/Chimera/i386/libsaio/fake_efi.c (revision 2251) +++ branches/Chimera/i386/libsaio/fake_efi.c (revision 2252) @@ -84,7 +84,8 @@ static uint8_t const VOIDRET_INSTRUCTIONS[] = {0xc3}; /* movl $0x80000003,%eax; ret */ -static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = {0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3}; +static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS_32[] = {0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3}; +static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS_64[] = {0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3}; EFI_SYSTEM_TABLE_32 *gST32 = NULL; EFI_SYSTEM_TABLE_64 *gST64 = NULL; @@ -167,7 +168,7 @@ EFI_CONFIGURATION_TABLE_32 efiConfigurationTable[MAX_CONFIGURATION_TABLE_ENTRIES]; EFI_CHAR16 firmwareVendor[sizeof(FIRMWARE_VENDOR)/sizeof(EFI_CHAR16)]; uint8_t voidret_instructions[sizeof(VOIDRET_INSTRUCTIONS)/sizeof(uint8_t)]; - uint8_t unsupportedret_instructions[sizeof(UNSUPPORTEDRET_INSTRUCTIONS)/sizeof(uint8_t)]; + uint8_t unsupportedret_instructions[sizeof(UNSUPPORTEDRET_INSTRUCTIONS_32)/sizeof(uint8_t)]; }; struct fake_efi_pages *fakeEfiPages = (struct fake_efi_pages*)AllocateKernelMemory(sizeof(struct fake_efi_pages)); @@ -179,7 +180,7 @@ // Initialize some machine code that will return EFI_UNSUPPORTED for // functions returning int and simply return for void functions. memcpy(fakeEfiPages->voidret_instructions, VOIDRET_INSTRUCTIONS, sizeof(VOIDRET_INSTRUCTIONS)); - memcpy(fakeEfiPages->unsupportedret_instructions, UNSUPPORTEDRET_INSTRUCTIONS, sizeof(UNSUPPORTEDRET_INSTRUCTIONS)); + memcpy(fakeEfiPages->unsupportedret_instructions, UNSUPPORTEDRET_INSTRUCTIONS_32, sizeof(UNSUPPORTEDRET_INSTRUCTIONS_32)); // -------------------------------------------------------------------- // System table @@ -277,7 +278,7 @@ EFI_CONFIGURATION_TABLE_64 efiConfigurationTable[MAX_CONFIGURATION_TABLE_ENTRIES]; EFI_CHAR16 firmwareVendor[sizeof(FIRMWARE_VENDOR)/sizeof(EFI_CHAR16)]; uint8_t voidret_instructions[sizeof(VOIDRET_INSTRUCTIONS)/sizeof(uint8_t)]; - uint8_t unsupportedret_instructions[sizeof(UNSUPPORTEDRET_INSTRUCTIONS)/sizeof(uint8_t)]; + uint8_t unsupportedret_instructions[sizeof(UNSUPPORTEDRET_INSTRUCTIONS_64)/sizeof(uint8_t)]; }; struct fake_efi_pages *fakeEfiPages = (struct fake_efi_pages*)AllocateKernelMemory(sizeof(struct fake_efi_pages)); @@ -289,7 +290,7 @@ // Initialize some machine code that will return EFI_UNSUPPORTED for // functions returning int and simply return for void functions. memcpy(fakeEfiPages->voidret_instructions, VOIDRET_INSTRUCTIONS, sizeof(VOIDRET_INSTRUCTIONS)); - memcpy(fakeEfiPages->unsupportedret_instructions, UNSUPPORTEDRET_INSTRUCTIONS, sizeof(UNSUPPORTEDRET_INSTRUCTIONS)); + memcpy(fakeEfiPages->unsupportedret_instructions, UNSUPPORTEDRET_INSTRUCTIONS_64, sizeof(UNSUPPORTEDRET_INSTRUCTIONS_64)); // -------------------------------------------------------------------- // System table Index: branches/Chimera/i386/boot2/modules.h =================================================================== --- branches/Chimera/i386/boot2/modules.h (revision 2251) +++ branches/Chimera/i386/boot2/modules.h (revision 2252) @@ -15,8 +15,8 @@ #define MODULE_PATH "/Extra/modules/" #define SYMBOLS_MODULE "Symbols.dylib" -#define SYMBOLS_AUTHOR "Chameleon" -#define SYMBOLS_DESCRIPTION "Chameleon symbols for linking" +#define SYMBOLS_AUTHOR "Chimera" +#define SYMBOLS_DESCRIPTION "Chimera symbols for linking" #define SYMBOLS_VERSION 0 #define SYMBOLS_COMPAT 0 Index: branches/Chimera/i386/modules/FileNVRAM/FileNVRAM.dylib =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: branches/Chimera/i386/modules/FileNVRAM/NEWS =================================================================== --- branches/Chimera/i386/modules/FileNVRAM/NEWS (revision 2251) +++ branches/Chimera/i386/modules/FileNVRAM/NEWS (revision 2252) @@ -1,10 +1,5 @@ FileNVRAM Release Notes -========= Version 1.1.3 ======= -* Fixed an potential issue where boot-args could get mangled. -* Fixed an issue where certain legacy variables were saved incorrectly. -* Fixed an issue where certain nvram variables not write to the file immediately. - ========= Version 1.1.2 ======= * Fixed a regression in 1.1.1 causing sleep to break. Index: branches/Chimera/revision =================================================================== --- branches/Chimera/revision (revision 2251) +++ branches/Chimera/revision (revision 2252) @@ -1 +1 @@ -2246 +2248 Index: branches/Chimera/CHANGES =================================================================== --- branches/Chimera/CHANGES (revision 2251) +++ branches/Chimera/CHANGES (revision 2252) @@ -1,9 +1,17 @@ -macman: Chimera 2.1.0 specific changes: + Rollbacked FileNVRAM.dylib to v1.1.2 + Includes most changes from trunk r2248 while retaining all previous Chimera v2.1.0 fixes and enhancements +- Fix issue booting x86 after rev.2175 (Credits to Mario, Alex and Leon). +-macman: Chimera 2.1.0 specific changes: Added Haswell CPU support with model and speed detection Disabled writing of boot arguments to nvram Reverted AMD graphics card reporting and log messages to Chimera v1.11.1 style Reverted NVIDIA graphics card reporting to Chimera v1.11.1 style - Included mosts changes from trunk r2246 that didn't conflict with Chimera 2.0.1 fixes and enhancements + Included mosts changes from trunk r2246 that didn't conflict with Chimera 2.0.1 fixes and enhancements +- Add boot support to 10.9 (thx old napalm) +- ErmaC : Update gui Icons OS detection +- Update default theme Icon set (thx BlackOsx) +- Add Linux GPT Partition Label - Fix menuBVR initialization problem - Implement ErmaC's HDAEnabler.dylib module - Fix Bug in the loop that look for an ATI card. Credits to Jief Luce