Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c (revision 1333) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c (revision 1334) @@ -436,7 +436,7 @@ { switch (Platform.CPU.Model) { - case 0x0D: // ??? + case CPU_MODEL_DOTHAN: // Intel Pentium M case CPU_MODEL_YONAH: // Intel Mobile Core Solo, Duo case CPU_MODEL_MEROM: // Intel Mobile Core 2 Solo, Duo, Xeon 30xx, Xeon 51xx, Xeon X53xx, Xeon E53xx, Xeon X32xx case CPU_MODEL_PENRYN: // Intel Core 2 Solo, Duo, Quad, Extreme, Xeon X54xx, Xeon X33xx @@ -562,7 +562,7 @@ case CPU_MODEL_DALES: case CPU_MODEL_DALES_32NM: // Intel Core i3, i5 LGA1156 (32nm) case CPU_MODEL_NEHALEM: // Intel Core i7, Xeon W35xx, Xeon X55xx, Xeon E55xx LGA1366 (45nm) - case CPU_MODEL_NEHALEM_EX: // Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65x + case CPU_MODEL_NEHALEM_EX: // Intel Xeon X75xx, Xeon X65xx, Xeon E75xx, Xeon E65xx 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_SANDY: // Intel Core i3, i5, i7 LGA1155 (32nm) Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.h =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.h (revision 1333) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.h (revision 1334) @@ -29,6 +29,7 @@ #define CPUID_88 8 #define CPUID_MAX 9 +#define CPU_MODEL_DOTHAN 0x0D // Dothan #define CPU_MODEL_YONAH 0x0E // Sossaman, Yonah #define CPU_MODEL_MEROM 0x0F // Allendale, Conroe, Kentsfield, Woodcrest, Clovertown, Tigerton, Merom #define CPU_MODEL_PENRYN 0x17 // Wolfdale, Yorkfield, Harpertown, Penryn Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c (revision 1333) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c (revision 1334) @@ -328,7 +328,6 @@ case CPU_MODEL_FIELDS: // Intel Core i5, i7, Xeon X34xx LGA1156 (45nm) case CPU_MODEL_DALES: case CPU_MODEL_DALES_32NM: // Intel Core i3, i5 LGA1156 (32nm) - case 0x19: // ??? Intel Core i5 650 @3.20 GHz defaultBIOSInfo.version = kDefaultiMacNehalemBIOSVersion; defaultSystemInfo.productName = kDefaultiMacNehalem; defaultSystemInfo.family = kDefaultiMacFamily; @@ -564,7 +563,6 @@ { switch (Platform.CPU.Model) { - case 0x19: // ??? Intel Core i5 650 @3.20 GHz case CPU_MODEL_FIELDS: // Intel Core i5, i7, Xeon X34xx LGA1156 (45nm) case CPU_MODEL_DALES: case CPU_MODEL_DALES_32NM: // Intel Core i3, i5 LGA1156 (32nm) Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/stringTable.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/stringTable.c (revision 1333) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/stringTable.c (revision 1334) @@ -634,6 +634,7 @@ break; } } + if(ret == -1) ret = loadHelperConfig(config); return ret; } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c (revision 1333) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c (revision 1334) @@ -41,14 +41,13 @@ { switch (Platform.CPU.Model) { - case 0x0D: // ??? + case CPU_MODEL_DOTHAN: // Intel Pentium M case CPU_MODEL_YONAH: // Intel Mobile Core Solo, Duo case CPU_MODEL_MEROM: // Intel Mobile Core 2 Solo, Duo, Xeon 30xx, Xeon 51xx, Xeon X53xx, Xeon E53xx, Xeon X32xx case CPU_MODEL_PENRYN: // Intel Core 2 Solo, Duo, Quad, Extreme, Xeon X54xx, Xeon X33xx case CPU_MODEL_ATOM: // Intel Atom (45nm) return false; - case 0x19: // ??? Intel Core i5 650 @3.20 GHz case CPU_MODEL_NEHALEM: // Intel Core i7, Xeon W35xx, Xeon X55xx, Xeon E55xx LGA1366 (45nm) case CPU_MODEL_FIELDS: // Intel Core i5, i7, Xeon X34xx LGA1156 (45nm) case CPU_MODEL_DALES: @@ -128,7 +127,7 @@ { switch (Platform.CPU.Model) { - case 0x0D: // ??? + case CPU_MODEL_DOTHAN: // Intel Pentium M case CPU_MODEL_YONAH: // Intel Mobile Core Solo, Duo case CPU_MODEL_MEROM: // Intel Mobile Core 2 Solo, Duo, Xeon 30xx, Xeon 51xx, Xeon X53xx, Xeon E53xx, Xeon X32xx case CPU_MODEL_PENRYN: // Intel Core 2 Solo, Duo, Quad, Extreme, Xeon X54xx, Xeon X33xx @@ -140,7 +139,6 @@ value->word = 0x0501; // Xeon else value->word = 0x0701; // Core i7 - return true; case CPU_MODEL_FIELDS: // Intel Core i5, i7, Xeon X34xx LGA1156 (45nm) @@ -173,10 +171,6 @@ case CPU_MODEL_WESTMERE_EX: // Intel Xeon E7 value->word = 0x0501; // Core i7 return true; - - case 0x19: // ??? Intel Core i5 650 @3.20 GHz - value->word = 0x0601; // Core i5 - return true; } } }