diff --git a/OpenCorePkg b/OpenCorePkg index 89dbceaa8..620e4378f 160000 --- a/OpenCorePkg +++ b/OpenCorePkg @@ -1 +1 @@ -Subproject commit 89dbceaa88e35383e14a6c1663345ced10dabb73 +Subproject commit 620e4378f9a3d0558c144936e3fc5affbf445e44 diff --git a/Xcode/Clover/Clover.xcodeproj/project.pbxproj b/Xcode/Clover/Clover.xcodeproj/project.pbxproj index 42165ecfb..ecfcc38aa 100644 --- a/Xcode/Clover/Clover.xcodeproj/project.pbxproj +++ b/Xcode/Clover/Clover.xcodeproj/project.pbxproj @@ -19268,69 +19268,69 @@ A588BDD725265F0F0089BA4A /* Library */ = { isa = PBXGroup; children = ( + A588BDF625265F0F0089BA4A /* DuetBdsLib */, + A588BF0725265F100089BA4A /* DuetTimerLib */, + A588BED225265F100089BA4A /* OcAcpiLib */, + A588BF0A25265F100089BA4A /* OcAfterBootCompatLib */, + A588BE1725265F0F0089BA4A /* OcApfsLib */, + A588BECC25265F100089BA4A /* OcAppleBootPolicyLib */, + A588BE2C25265F0F0089BA4A /* OcAppleChunklistLib */, + A588BEF025265F100089BA4A /* OcAppleDiskImageLib */, + A588BE0F25265F0F0089BA4A /* OcAppleEventLib */, + A588BE3925265F0F0089BA4A /* OcAppleImageConversionLib */, + A588BE3625265F0F0089BA4A /* OcAppleImageVerificationLib */, + A588BE5825265F0F0089BA4A /* OcAppleImg4Lib */, + A588BF3825265F100089BA4A /* OcAppleKernelLib */, + A588BEA325265F100089BA4A /* OcAppleKeyMapLib */, + A588BEC925265F100089BA4A /* OcAppleKeysLib */, + A588BF8A25265F100089BA4A /* OcAppleRamDiskLib */, + A588BEBC25265F100089BA4A /* OcAppleSecureBootLib */, + A588BECF25265F100089BA4A /* OcAppleUserInterfaceThemeLib */, + A588BF2925265F100089BA4A /* OcAudioLib */, + A588BE7225265F100089BA4A /* OcBootManagementLib */, + A588BF0225265F100089BA4A /* OcBootServicesTableLib */, + A588BF7C25265F100089BA4A /* OcCompilerIntrinsicsLib */, + A588BE8425265F100089BA4A /* OcCompressionLib */, + A588BF6325265F100089BA4A /* OcConfigurationLib */, + A588BE3225265F0F0089BA4A /* OcConsoleControlEntryModeLib */, + A588BDFE25265F0F0089BA4A /* OcConsoleLib */, + A588BF5725265F100089BA4A /* OcCpuLib */, + A588BE3C25265F0F0089BA4A /* OcCryptoLib */, + A588BDF125265F0F0089BA4A /* OcDataHubLib */, + A588BF2125265F100089BA4A /* OcDebugLogLib */, + A588BF6A25265F100089BA4A /* OcDebugLogLibOc2Clover */, + A588BF1D25265F100089BA4A /* OcDevicePathLib */, + A588BF7325265F100089BA4A /* OcDevicePropertyLib */, + A588BE1E25265F0F0089BA4A /* OcDeviceTreeLib */, + A588BF6725265F100089BA4A /* OcDriverConnectionLib */, + A588BF4C25265F100089BA4A /* OcFileLib */, + A588BEEC25265F100089BA4A /* OcFirmwarePasswordLib */, + A588BF1825265F100089BA4A /* OcFirmwareVolumeLib */, + A588BEBF25265F100089BA4A /* OcGuardLib */, + A588BE2825265F0F0089BA4A /* OcHashServicesLib */, + A588BEFE25265F100089BA4A /* OcHdaDevicesLib */, + A588BE2F25265F0F0089BA4A /* OcHeciLib */, + A588BEB125265F100089BA4A /* OcHiiDatabaseLib */, + A588BED625265F100089BA4A /* OcInputLib */, A588BDD825265F0F0089BA4A /* OcMachoLib */, A588BDE025265F0F0089BA4A /* OcMacInfoLib */, - A588BDE525265F0F0089BA4A /* OcStringLib */, - A588BDE925265F0F0089BA4A /* OcPngLib */, - A588BDEE25265F0F0089BA4A /* OcSerializeLib */, - A588BDF125265F0F0089BA4A /* OcDataHubLib */, - A588BDF625265F0F0089BA4A /* DuetBdsLib */, - A588BDFE25265F0F0089BA4A /* OcConsoleLib */, - A588BE0A25265F0F0089BA4A /* OcRtcLib */, - A588BE0F25265F0F0089BA4A /* OcAppleEventLib */, - A588BE1725265F0F0089BA4A /* OcApfsLib */, - A588BE1E25265F0F0089BA4A /* OcDeviceTreeLib */, - A588BE2125265F0F0089BA4A /* OcUnicodeCollationEngLib */, - A588BE2825265F0F0089BA4A /* OcHashServicesLib */, - A588BE2C25265F0F0089BA4A /* OcAppleChunklistLib */, - A588BE2F25265F0F0089BA4A /* OcHeciLib */, - A588BE3225265F0F0089BA4A /* OcConsoleControlEntryModeLib */, - A588BE3625265F0F0089BA4A /* OcAppleImageVerificationLib */, - A588BE3925265F0F0089BA4A /* OcAppleImageConversionLib */, - A588BE3C25265F0F0089BA4A /* OcCryptoLib */, - A588BE4E25265F0F0089BA4A /* OcMiscLib */, - A588BE5525265F0F0089BA4A /* OcTimerLib */, - A588BE5825265F0F0089BA4A /* OcAppleImg4Lib */, - A588BE7225265F100089BA4A /* OcBootManagementLib */, - A588BE8425265F100089BA4A /* OcCompressionLib */, - A588BEA325265F100089BA4A /* OcAppleKeyMapLib */, - A588BEA625265F100089BA4A /* OcSmbiosLib */, - A588BEAE25265F100089BA4A /* OcStorageLib */, - A588BEB125265F100089BA4A /* OcHiiDatabaseLib */, - A588BEBC25265F100089BA4A /* OcAppleSecureBootLib */, - A588BEBF25265F100089BA4A /* OcGuardLib */, - A588BEC925265F100089BA4A /* OcAppleKeysLib */, - A588BECC25265F100089BA4A /* OcAppleBootPolicyLib */, - A588BECF25265F100089BA4A /* OcAppleUserInterfaceThemeLib */, - A588BED225265F100089BA4A /* OcAcpiLib */, - A588BED625265F100089BA4A /* OcInputLib */, - A588BEEC25265F100089BA4A /* OcFirmwarePasswordLib */, - A588BEF025265F100089BA4A /* OcAppleDiskImageLib */, - A588BEF625265F100089BA4A /* OcRngLib */, - A588BEFE25265F100089BA4A /* OcHdaDevicesLib */, - A588BF0225265F100089BA4A /* OcBootServicesTableLib */, - A588BF0725265F100089BA4A /* DuetTimerLib */, - A588BF0A25265F100089BA4A /* OcAfterBootCompatLib */, - A588BF1825265F100089BA4A /* OcFirmwareVolumeLib */, - A588BF1D25265F100089BA4A /* OcDevicePathLib */, - A588BF2125265F100089BA4A /* OcDebugLogLib */, - A588BF2925265F100089BA4A /* OcAudioLib */, - A588BF3125265F100089BA4A /* OcVirtualFsLib */, - A588BF3825265F100089BA4A /* OcAppleKernelLib */, - A588BF4925265F100089BA4A /* OcPeCoffLib */, - A588BF4C25265F100089BA4A /* OcFileLib */, - A588BF5725265F100089BA4A /* OcCpuLib */, - A588BF6325265F100089BA4A /* OcConfigurationLib */, - A588BF6725265F100089BA4A /* OcDriverConnectionLib */, - A588BF6A25265F100089BA4A /* OcDebugLogLibOc2Clover */, - A588BF7025265F100089BA4A /* OcXmlLib */, - A588BF7325265F100089BA4A /* OcDevicePropertyLib */, - A588BF7625265F100089BA4A /* OcOSInfoLib */, - A588BF7925265F100089BA4A /* OcTemplateLib */, - A588BF7C25265F100089BA4A /* OcCompilerIntrinsicsLib */, A588BF8025265F100089BA4A /* OcMemoryLib */, - A588BF8A25265F100089BA4A /* OcAppleRamDiskLib */, + A588BE4E25265F0F0089BA4A /* OcMiscLib */, + A588BF7625265F100089BA4A /* OcOSInfoLib */, + A588BF4925265F100089BA4A /* OcPeCoffLib */, + A588BDE925265F0F0089BA4A /* OcPngLib */, + A588BEF625265F100089BA4A /* OcRngLib */, + A588BE0A25265F0F0089BA4A /* OcRtcLib */, + A588BDEE25265F0F0089BA4A /* OcSerializeLib */, + A588BEA625265F100089BA4A /* OcSmbiosLib */, A588BF8D25265F100089BA4A /* OcSmcLib */, + A588BEAE25265F100089BA4A /* OcStorageLib */, + A588BDE525265F0F0089BA4A /* OcStringLib */, + A588BF7925265F100089BA4A /* OcTemplateLib */, + A588BE5525265F0F0089BA4A /* OcTimerLib */, + A588BE2125265F0F0089BA4A /* OcUnicodeCollationEngLib */, + A588BF3125265F100089BA4A /* OcVirtualFsLib */, + A588BF7025265F100089BA4A /* OcXmlLib */, ); path = Library; sourceTree = ""; diff --git a/rEFIt_UEFI/Platform/StateGenerator.cpp b/rEFIt_UEFI/Platform/StateGenerator.cpp index 603e8ec38..c8a86014c 100644 --- a/rEFIt_UEFI/Platform/StateGenerator.cpp +++ b/rEFIt_UEFI/Platform/StateGenerator.cpp @@ -377,10 +377,10 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number) AML_CHUNK* metPCT; AML_CHUNK* root = aml_create_node(NULL); aml_add_buffer(root, (UINT8*)&pss_ssdt_header[0], sizeof(pss_ssdt_header)); // SSDT header - snprintf(name, 31, "%s%4s", acpi_cpu_score, acpi_cpu_name[0]); - snprintf(name1, 31, "%s%4sPSS_", acpi_cpu_score, acpi_cpu_name[0]); - snprintf(name2, 31, "%s%4sPCT_", acpi_cpu_score, acpi_cpu_name[0]); - snprintf(name3, 31, "%s%4s_PPC", acpi_cpu_score, acpi_cpu_name[0]); + snprintf(name, 31, "%s%4s", acpi_cpu_score, acpi_cpu_name[0]); + snprintf(name1, 31, "%s%4sPSS_", acpi_cpu_score, acpi_cpu_name[0]); + snprintf(name2, 31, "%s%4sPCT_", acpi_cpu_score, acpi_cpu_name[0]); + snprintf(name3, 31, "%s%4s_PPC", acpi_cpu_score, acpi_cpu_name[0]); scop = aml_add_scope(root, name); @@ -444,7 +444,7 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number) // Add CPUs for (decltype(Number) i = 1; i < Number; i++) { - snprintf(name, 31, "%s%4s", acpi_cpu_score, acpi_cpu_name[i]); + snprintf(name, 31, "%s%4s", acpi_cpu_score, acpi_cpu_name[i]); scop = aml_add_scope(root, name); metPSS = aml_add_method(scop, "_PSS", 0); aml_add_return_name(metPSS, name1);