diff --git a/Include/Library/OcAppleBootCompatLib.h b/Include/Library/OcAfterBootCompatLib.h similarity index 97% rename from Include/Library/OcAppleBootCompatLib.h rename to Include/Library/OcAfterBootCompatLib.h index 0a2cb26e..4125f50c 100644 --- a/Include/Library/OcAppleBootCompatLib.h +++ b/Include/Library/OcAfterBootCompatLib.h @@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef OC_APPLE_BOOT_COMPAT_LIB_H -#define OC_APPLE_BOOT_COMPAT_LIB_H +#ifndef OC_AFTER_BOOT_COMPAT_LIB_H +#define OC_AFTER_BOOT_COMPAT_LIB_H /** Apple Boot Compatibility layer configuration. @@ -137,4 +137,4 @@ OcAbcInitialize ( IN OC_ABC_SETTINGS *Settings ); -#endif // OC_APPLE_BOOT_COMPAT_LIB_H +#endif // OC_AFTER_BOOT_COMPAT_LIB_H diff --git a/Include/Protocol/OcAppleBootCompat.h b/Include/Protocol/OcAfterBootCompat.h similarity index 69% rename from Include/Protocol/OcAppleBootCompat.h rename to Include/Protocol/OcAfterBootCompat.h index 1491161d..21f8aded 100644 --- a/Include/Protocol/OcAppleBootCompat.h +++ b/Include/Protocol/OcAfterBootCompat.h @@ -12,16 +12,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef OC_APPLE_BOOT_COMPAT_PROTOCOL_H -#define OC_APPLE_BOOT_COMPAT_PROTOCOL_H +#ifndef OC_AFTER_BOOT_COMPAT_PROTOCOL_H +#define OC_AFTER_BOOT_COMPAT_PROTOCOL_H -#define OC_APPLE_BOOT_COMPAT_PROTOCOL_REVISION 0x010000 +#define OC_AFTER_BOOT_COMPAT_PROTOCOL_REVISION 0x010000 // -// OC_APPLE_BOOT_COMPAT_PROTOCOL_GUID +// OC_AFTER_BOOT_COMPAT_PROTOCOL_GUID // C7CBA84E-CC77-461D-9E3C-6BE0CB79A7C1 // -#define OC_APPLE_BOOT_COMPAT_PROTOCOL_GUID \ +#define OC_AFTER_BOOT_COMPAT_PROTOCOL_GUID \ { 0xC7CBA84E, 0xCC77, 0x461D, \ { 0x9E, 0x3C, 0x6B, 0xE0, 0xCB, 0x79, 0xA7, 0xC1 } } @@ -30,8 +30,8 @@ // typedef struct { UINTN Revision; -} OC_APPLE_BOOT_COMPAT_PROTOCOL; +} OC_AFTER_BOOT_COMPAT_PROTOCOL; -extern EFI_GUID gOcAppleBootCompatProtocolGuid; +extern EFI_GUID gOcAfterBootCompatProtocolGuid; -#endif // OC_APPLE_BOOT_COMPAT_PROTOCOL_H +#endif // OC_AFTER_BOOT_COMPAT_PROTOCOL_H diff --git a/Library/OcAppleBootCompatLib/BootCompatInternal.h b/Library/OcAfterBootCompatLib/BootCompatInternal.h similarity index 99% rename from Library/OcAppleBootCompatLib/BootCompatInternal.h rename to Library/OcAfterBootCompatLib/BootCompatInternal.h index 79ee780f..8e2682b8 100644 --- a/Library/OcAppleBootCompatLib/BootCompatInternal.h +++ b/Library/OcAfterBootCompatLib/BootCompatInternal.h @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/Library/OcAppleBootCompatLib/CustomSlide.c b/Library/OcAfterBootCompatLib/CustomSlide.c similarity index 100% rename from Library/OcAppleBootCompatLib/CustomSlide.c rename to Library/OcAfterBootCompatLib/CustomSlide.c diff --git a/Library/OcAppleBootCompatLib/IA32/ContextSwitch.h b/Library/OcAfterBootCompatLib/IA32/ContextSwitch.h similarity index 100% rename from Library/OcAppleBootCompatLib/IA32/ContextSwitch.h rename to Library/OcAfterBootCompatLib/IA32/ContextSwitch.h diff --git a/Library/OcAppleBootCompatLib/IA32/ContextSwitchSupport.c b/Library/OcAfterBootCompatLib/IA32/ContextSwitchSupport.c similarity index 100% rename from Library/OcAppleBootCompatLib/IA32/ContextSwitchSupport.c rename to Library/OcAfterBootCompatLib/IA32/ContextSwitchSupport.c diff --git a/Library/OcAppleBootCompatLib/KernelSupport.c b/Library/OcAfterBootCompatLib/KernelSupport.c similarity index 100% rename from Library/OcAppleBootCompatLib/KernelSupport.c rename to Library/OcAfterBootCompatLib/KernelSupport.c diff --git a/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.c b/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.c similarity index 90% rename from Library/OcAppleBootCompatLib/OcAppleBootCompatLib.c rename to Library/OcAfterBootCompatLib/OcAfterBootCompatLib.c index a8e3b43f..9bbb2445 100644 --- a/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.c +++ b/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.c @@ -19,14 +19,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include "BootCompatInternal.h" @@ -35,15 +35,15 @@ with legacy AptioMemoryFix protocol, allowing us to avoid conflicts between the two. **/ -STATIC OC_APPLE_BOOT_COMPAT_PROTOCOL mOcAppleBootCompatProtocol = { - OC_APPLE_BOOT_COMPAT_PROTOCOL_REVISION +STATIC OC_AFTER_BOOT_COMPAT_PROTOCOL mOcAfterBootCompatProtocol = { + OC_AFTER_BOOT_COMPAT_PROTOCOL_REVISION }; /** Apple Boot Compatibility context. This context is used throughout the library. Must be accessed through GetBootCompatContext (). **/ -STATIC BOOT_COMPAT_CONTEXT mOcAppleBootCompatContext; +STATIC BOOT_COMPAT_CONTEXT mOcAfterBootCompatContext; STATIC EFI_STATUS @@ -56,7 +56,7 @@ InstallAbcProtocol ( EFI_HANDLE Handle; Status = gBS->LocateProtocol ( - &gOcAppleBootCompatProtocolGuid, + &gOcAfterBootCompatProtocolGuid, NULL, &Interface ); @@ -73,8 +73,8 @@ InstallAbcProtocol ( Handle = NULL; Status = gBS->InstallMultipleProtocolInterfaces ( &Handle, - &gOcAppleBootCompatProtocolGuid, - &mOcAppleBootCompatProtocol, + &gOcAfterBootCompatProtocolGuid, + &mOcAfterBootCompatProtocol, NULL ); @@ -91,7 +91,7 @@ GetBootCompatContext ( VOID ) { - return &mOcAppleBootCompatContext; + return &mOcAfterBootCompatContext; } EFI_STATUS diff --git a/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.inf b/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.inf similarity index 90% rename from Library/OcAppleBootCompatLib/OcAppleBootCompatLib.inf rename to Library/OcAfterBootCompatLib/OcAfterBootCompatLib.inf index 9a9dfa6d..2aebbf87 100644 --- a/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.inf +++ b/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.inf @@ -18,11 +18,11 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = OcAppleBootCompatLib + BASE_NAME = OcAfterBootCompatLib FILE_GUID = A393F7CF-3966-4C7E-8763-3DD991681C9B MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = OcAppleBootCompatLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER + LIBRARY_CLASS = OcAfterBootCompatLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_DRIVER UEFI_APPLICATION DXE_SMM_DRIVER # # The following information is for reference only and not required by the build tools. @@ -34,7 +34,7 @@ BootCompatInternal.h CustomSlide.c KernelSupport.c - OcAppleBootCompatLib.c + OcAfterBootCompatLib.c ServiceOverrides.c # All headers should go to [Sources], this sounds like a bug in EDK II Build System. IA32/ContextSwitch.h @@ -57,7 +57,7 @@ gAppleBootVariableGuid ## SOMETIMES_CONSUMES [Protocols] - gOcAppleBootCompatProtocolGuid ## PRODUCES + gOcAfterBootCompatProtocolGuid ## PRODUCES gOcFirmwareRuntimeProtocolGuid ## SOMETIMES_CONSUMES [LibraryClasses] diff --git a/Library/OcAppleBootCompatLib/ServiceOverrides.c b/Library/OcAfterBootCompatLib/ServiceOverrides.c similarity index 100% rename from Library/OcAppleBootCompatLib/ServiceOverrides.c rename to Library/OcAfterBootCompatLib/ServiceOverrides.c diff --git a/Library/OcAppleBootCompatLib/X64/ContextSwitch.h b/Library/OcAfterBootCompatLib/X64/ContextSwitch.h similarity index 100% rename from Library/OcAppleBootCompatLib/X64/ContextSwitch.h rename to Library/OcAfterBootCompatLib/X64/ContextSwitch.h diff --git a/Library/OcAppleBootCompatLib/X64/ContextSwitch.nasm b/Library/OcAfterBootCompatLib/X64/ContextSwitch.nasm similarity index 100% rename from Library/OcAppleBootCompatLib/X64/ContextSwitch.nasm rename to Library/OcAfterBootCompatLib/X64/ContextSwitch.nasm diff --git a/Library/OcAppleBootCompatLib/X64/ContextSwitchSupport.c b/Library/OcAfterBootCompatLib/X64/ContextSwitchSupport.c similarity index 100% rename from Library/OcAppleBootCompatLib/X64/ContextSwitchSupport.c rename to Library/OcAfterBootCompatLib/X64/ContextSwitchSupport.c diff --git a/OpenCorePkg.dec b/OpenCorePkg.dec index 34c745ac..a6288abd 100755 --- a/OpenCorePkg.dec +++ b/OpenCorePkg.dec @@ -69,8 +69,8 @@ ## Include/Protocol/OcLog.h gOcLogProtocolGuid = { 0xDBB6008F, 0x89E4, 0x4272, { 0x98, 0x81, 0xCE, 0x3A, 0xFD, 0x97, 0x24, 0xD0 }} - # Include/Protocol/OcAppleBootCompat.h - gOcAppleBootCompatProtocolGuid = { 0xC7CBA84E, 0xCC77, 0x461D, { 0x9E, 0x3C, 0x6B, 0xE0, 0xCB, 0x79, 0xA7, 0xC1 }} + # Include/Protocol/OcAfterBootCompat.h + gOcAfterBootCompatProtocolGuid = { 0xC7CBA84E, 0xCC77, 0x461D, { 0x9E, 0x3C, 0x6B, 0xE0, 0xCB, 0x79, 0xA7, 0xC1 }} ## Include/Protocol/OcFirmwareRuntime.h gOcFirmwareRuntimeProtocolGuid = { 0x570332E4, 0xFC50, 0x4B21, { 0xAB, 0xE8, 0xAE, 0x72, 0xF0, 0x5B, 0x4F, 0xF7 }} @@ -143,7 +143,7 @@ OcAcpiLib|Include/Library/OcAcpiLib.h ## @libraryclass - OcAppleBootCompatLib|Include/Library/OcAppleBootCompatLib.h + OcAfterBootCompatLib|Include/Library/OcAfterBootCompatLib.h ## @libraryclass OcAppleBootPolicyLib|Include/Library/OcAppleBootPolicyLib.h diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc index cf2e0ac2..bef76f7c 100755 --- a/OpenCorePkg.dsc +++ b/OpenCorePkg.dsc @@ -44,7 +44,7 @@ MacInfoLib|MacInfoPkg/Library/MacInfoLib/MacInfoLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf OcAcpiLib|OpenCorePkg/Library/OcAcpiLib/OcAcpiLib.inf - OcAppleBootCompatLib|OpenCorePkg/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.inf + OcAfterBootCompatLib|OpenCorePkg/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.inf OcAppleBootPolicyLib|OpenCorePkg/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.inf OcAppleChunklistLib|OpenCorePkg/Library/OcAppleChunklistLib/OcAppleChunklistLib.inf OcAppleDiskImageLib|OpenCorePkg/Library/OcAppleDiskImageLib/OcAppleDiskImageLib.inf @@ -151,7 +151,7 @@ OpenCorePkg/Application/VerifyMsrE2/VerifyMsrE2.inf OpenCorePkg/Debug/GdbSyms/GdbSyms.inf OpenCorePkg/Library/OcAcpiLib/OcAcpiLib.inf - OpenCorePkg/Library/OcAppleBootCompatLib/OcAppleBootCompatLib.inf + OpenCorePkg/Library/OcAfterBootCompatLib/OcAfterBootCompatLib.inf OpenCorePkg/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.inf OpenCorePkg/Library/OcAppleChunklistLib/OcAppleChunklistLib.inf OpenCorePkg/Library/OcAppleDiskImageLib/OcAppleDiskImageLib.inf diff --git a/Platform/OpenCore/OpenCore.inf b/Platform/OpenCore/OpenCore.inf index 065140ae..db4573f2 100644 --- a/Platform/OpenCore/OpenCore.inf +++ b/Platform/OpenCore/OpenCore.inf @@ -71,7 +71,7 @@ DevicePathLib IoLib OcAcpiLib - OcAppleBootCompatLib + OcAfterBootCompatLib OcAppleBootPolicyLib OcAppleEventLib OcAppleImageConversionLib diff --git a/Platform/OpenCore/OpenCoreUefi.c b/Platform/OpenCore/OpenCoreUefi.c index 99f5c026..995a3f7e 100644 --- a/Platform/OpenCore/OpenCoreUefi.c +++ b/Platform/OpenCore/OpenCoreUefi.c @@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include #include #include diff --git a/Platform/OpenCore/OpenCoreUefiAudio.c b/Platform/OpenCore/OpenCoreUefiAudio.c index b648f140..45eed0b9 100644 --- a/Platform/OpenCore/OpenCoreUefiAudio.c +++ b/Platform/OpenCore/OpenCoreUefiAudio.c @@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include #include #include diff --git a/Platform/OpenCore/OpenCoreUefiInOut.c b/Platform/OpenCore/OpenCoreUefiInOut.c index bc223ad6..a486609c 100644 --- a/Platform/OpenCore/OpenCoreUefiInOut.c +++ b/Platform/OpenCore/OpenCoreUefiInOut.c @@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include #include #include