archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcMacInfoLib: Fix matching MBP for 64-bit kernel type

Browse Source
This commit is contained in:
vit9696 2020-08-29 20:00:48 +03:00
parent 479226f4c6
commit 91ff2510bc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/OcMacInfoLib/OcMacInfoLib.c
View File

@ -25,19 +25,19 @@
STATIC CONST UINT32 mDevicePathsSupported = 1;
STATIC
CONST MAC_INFO_64BIT_COMPAT_ENTRY Mac64BitModels[] = {
CONST MAC_INFO_64BIT_COMPAT_ENTRY gMac64BitModels[] = {
{
"Macmini", 0, 3
},
{
"MacBook", 0, 5
},
{
"MacBookAir", 0, 2
},
{
"MacBookPro", 4, 3
},
{
"MacBook", 0, 5
},
{
"iMac", 8, 7
},
@ -171,22 +171,22 @@ IsMacModel64BitCompatible (
SystemModelLength = AsciiStrLen (ProductName);
for (Index = 0; Index < sizeof (Mac64BitModels); Index++) {
CurrentModelLength = AsciiStrLen (Mac64BitModels[Index].ModelName);
for (Index = 0; Index < sizeof (gMac64BitModels); Index++) {
CurrentModelLength = AsciiStrLen (gMac64BitModels[Index].ModelName);
if (SystemModelLength <= CurrentModelLength) {
continue;
}
if (AsciiStrnCmp (ProductName, Mac64BitModels[Index].ModelName, CurrentModelLength) == 0) {
if (AsciiStrnCmp (ProductName, gMac64BitModels[Index].ModelName, CurrentModelLength) == 0) {
SystemModelSuffix = &ProductName[CurrentModelLength];
SystemModelSeparator = AsciiStrStr (SystemModelSuffix, ",");
Status = AsciiStrDecimalToUint64S (SystemModelSuffix, &SystemModelSeparator, &SystemModelMajor);
if (!EFI_ERROR (Status)) {
if (OcMatchDarwinVersion (KernelVersion, KERNEL_VERSION_SNOW_LEOPARD_MIN, KERNEL_VERSION_SNOW_LEOPARD_MAX)) {
return Mac64BitModels[Index].SnowLeoMin64 != 0 && SystemModelMajor >= Mac64BitModels[Index].SnowLeoMin64;
return gMac64BitModels[Index].SnowLeoMin64 != 0 && SystemModelMajor >= gMac64BitModels[Index].SnowLeoMin64;
} else if (OcMatchDarwinVersion (KernelVersion, KERNEL_VERSION_LION_MIN, KERNEL_VERSION_LION_MAX)) {
return Mac64BitModels[Index].LionMin64 != 0 && SystemModelMajor >= Mac64BitModels[Index].LionMin64;
return gMac64BitModels[Index].LionMin64 != 0 && SystemModelMajor >= gMac64BitModels[Index].LionMin64;
}
}
}