prepare to fifteen

Signed-off-by: Slice <sergey.slice@gmail.com>
This commit is contained in:
Slice 2024-05-19 20:25:30 +03:00
parent 13d100ffb7
commit 06d591c810
7 changed files with 17 additions and 3 deletions

View File

@ -66,6 +66,8 @@
GFX0+IGPU+display
Mac-7BA5B2D9E42DDD94 iMacPro1,1 Vega 56, no IGPU
VMWare
VMM-x86_64
*/
// for HWTarget recommended values for T2 models (by Gradou)

View File

@ -89,13 +89,14 @@ public:
SmbiosPlistClass::SmbiosDictClass SMBIOS_monterey = SmbiosPlistClass::SmbiosDictClass();
SmbiosPlistClass::SmbiosDictClass SMBIOS_ventura = SmbiosPlistClass::SmbiosDictClass();
SmbiosPlistClass::SmbiosDictClass SMBIOS_sonoma = SmbiosPlistClass::SmbiosDictClass();
SmbiosPlistClass::SmbiosDictClass SMBIOS_fifteen = SmbiosPlistClass::SmbiosDictClass();
// SmbiosPlistClass::SmbiosDictClass SMBIOS_lion = SmbiosPlistClass::SmbiosDictClass();
public:
SystemParameters_Class SystemParameters = SystemParameters_Class();
RtVariables_Class RtVariables = RtVariables_Class();
Quirks_Class Quirks = Quirks_Class();
XmlDictField m_fields[26] = {
XmlDictField m_fields[27] = {
{"ACPI", ACPI},
{"Boot", Boot},
{"BootGraphics", BootGraphics},
@ -119,6 +120,7 @@ public:
{"SMBIOS_monterey", SMBIOS_monterey},
{"SMBIOS_ventura", SMBIOS_ventura},
{"SMBIOS_sonoma", SMBIOS_sonoma},
{"SMBIOS_fifteen", SMBIOS_fifteen},
{"SystemParameters", SystemParameters},
{"RtVariables", RtVariables},
{"Quirks", Quirks},

View File

@ -761,8 +761,9 @@ public:
SmbiosDictClass SMBIOS_monterey = SmbiosDictClass();
SmbiosDictClass SMBIOS_ventura = SmbiosDictClass();
SmbiosDictClass SMBIOS_sonoma = SmbiosDictClass();
SmbiosDictClass SMBIOS_fifteen = SmbiosDictClass();
XmlDictField m_fields[14] = {
XmlDictField m_fields[15] = {
{"SMBIOS", SMBIOS},
{"SMBIOS_lion", SMBIOS_lion},
{"SMBIOS_cougar", SMBIOS_cougar},
@ -777,6 +778,7 @@ public:
{"SMBIOS_monterey", SMBIOS_monterey},
{"SMBIOS_ventura", SMBIOS_ventura},
{"SMBIOS_sonoma", SMBIOS_sonoma},
{"SMBIOS_fifteen", SMBIOS_fifteen},
};
public:

View File

@ -587,6 +587,8 @@ MacOsVersion GetOSVersion(int LoaderType, const EFI_GUID& APFSTargetUUID, const
OSVersion = "13"_XS8;
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Sonoma") || Prop->getString()->stringValue().contains("Install%20macOS%2014")) {
OSVersion = "14"_XS8;
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Fifteen") || Prop->getString()->stringValue().contains("Install%20macOS%2015")) {
OSVersion = "15"_XS8;
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%2010.16")) {
OSVersion = "10.16"_XS8;
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Catalina") || Prop->getString()->stringValue().contains("Install%20macOS%2010.15")) {
@ -839,6 +841,9 @@ GetOSIconName (const MacOsVersion& OSVersion)
XStringW OSIconName;
if (OSVersion.isEmpty()) {
OSIconName = L"mac"_XSW;
} else if (OSVersion.elementAt(0) == 15 ){
// Fifteen
OSIconName = L"fifteen,mac"_XSW;
} else if (OSVersion.elementAt(0) == 14 ){
// Sonoma
OSIconName = L"sonoma,mac"_XSW;

View File

@ -86,6 +86,7 @@ CONST LString8 IconsNames[] = {
"os_monterey", //54 == ICON_MONTEREY
"os_ventura", //55 == ICON_VENTURA
"os_sonoma", //56 == ICON_SONOMA
"os_fifteen", //57 == ICON_FIFTEEN
""
};
const INTN IconsNamesSize = sizeof(IconsNames) / sizeof(IconsNames[0]);

View File

@ -364,6 +364,7 @@ void DebugPause(void);
#define ICON_MONTEREY (54)
#define ICON_VENTURA (55)
#define ICON_SONOMA (56)
#define ICON_FIFTEEN (57)
#define BUILTIN_ICON_BACKGROUND (100)
#define BUILTIN_ICON_SELECTION (101)
#define BUILTIN_ICON_ANIME (102)

View File

@ -1586,7 +1586,8 @@ void LOADER_ENTRY::StartLoader()
strncmp(InstallerVersion, "11.", 3) &&
strncmp(InstallerVersion, "12.", 3) &&
strncmp(InstallerVersion, "13.", 3) &&
strncmp(InstallerVersion, "14.", 3)
strncmp(InstallerVersion, "14.", 3) &&
strncmp(InstallerVersion, "15.", 3)
) {
InstallerVersion = NULL; // flag known version was not found
}