]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain / DxeMain.c
index db21311f93529ea6ebbdb2756cdafd213525dec6..2c27fc0695bc217e804636814b7888b5f99bab18 100644 (file)
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //\r
 // DXE Core Global Variables for Protocols from PEI\r
 //\r
-EFI_HANDLE                                mDecompressHandle = NULL;\r
+EFI_HANDLE  mDecompressHandle = NULL;\r
 \r
 //\r
 // DXE Core globals for Architecture Protocols\r
@@ -27,18 +27,18 @@ EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *gWatchdogTimer = NULL;
 //\r
 // DXE Core globals for optional protocol dependencies\r
 //\r
-EFI_SMM_BASE2_PROTOCOL            *gSmmBase2      = NULL;\r
+EFI_SMM_BASE2_PROTOCOL  *gSmmBase2 = NULL;\r
 \r
 //\r
 // DXE Core Global used to update core loaded image protocol handle\r
 //\r
-EFI_GUID                           *gDxeCoreFileName;\r
-EFI_LOADED_IMAGE_PROTOCOL          *gDxeCoreLoadedImage;\r
+EFI_GUID                   *gDxeCoreFileName;\r
+EFI_LOADED_IMAGE_PROTOCOL  *gDxeCoreLoadedImage;\r
 \r
 //\r
 // DXE Core Module Variables\r
 //\r
-EFI_BOOT_SERVICES mBootServices = {\r
+EFI_BOOT_SERVICES  mBootServices = {\r
   {\r
     EFI_BOOT_SERVICES_SIGNATURE,                                                          // Signature\r
     EFI_BOOT_SERVICES_REVISION,                                                           // Revision\r
@@ -46,81 +46,81 @@ EFI_BOOT_SERVICES mBootServices = {
     0,                                                                                    // CRC32\r
     0                                                                                     // Reserved\r
   },\r
-  (EFI_RAISE_TPL)                               CoreRaiseTpl,                             // RaiseTPL\r
-  (EFI_RESTORE_TPL)                             CoreRestoreTpl,                           // RestoreTPL\r
-  (EFI_ALLOCATE_PAGES)                          CoreAllocatePages,                        // AllocatePages\r
-  (EFI_FREE_PAGES)                              CoreFreePages,                            // FreePages\r
-  (EFI_GET_MEMORY_MAP)                          CoreGetMemoryMap,                         // GetMemoryMap\r
-  (EFI_ALLOCATE_POOL)                           CoreAllocatePool,                         // AllocatePool\r
-  (EFI_FREE_POOL)                               CoreFreePool,                             // FreePool\r
-  (EFI_CREATE_EVENT)                            CoreCreateEvent,                          // CreateEvent\r
-  (EFI_SET_TIMER)                               CoreSetTimer,                             // SetTimer\r
-  (EFI_WAIT_FOR_EVENT)                          CoreWaitForEvent,                         // WaitForEvent\r
-  (EFI_SIGNAL_EVENT)                            CoreSignalEvent,                          // SignalEvent\r
-  (EFI_CLOSE_EVENT)                             CoreCloseEvent,                           // CloseEvent\r
-  (EFI_CHECK_EVENT)                             CoreCheckEvent,                           // CheckEvent\r
-  (EFI_INSTALL_PROTOCOL_INTERFACE)              CoreInstallProtocolInterface,             // InstallProtocolInterface\r
-  (EFI_REINSTALL_PROTOCOL_INTERFACE)            CoreReinstallProtocolInterface,           // ReinstallProtocolInterface\r
-  (EFI_UNINSTALL_PROTOCOL_INTERFACE)            CoreUninstallProtocolInterface,           // UninstallProtocolInterface\r
-  (EFI_HANDLE_PROTOCOL)                         CoreHandleProtocol,                       // HandleProtocol\r
-  (VOID *)                                      NULL,                                     // Reserved\r
-  (EFI_REGISTER_PROTOCOL_NOTIFY)                CoreRegisterProtocolNotify,               // RegisterProtocolNotify\r
-  (EFI_LOCATE_HANDLE)                           CoreLocateHandle,                         // LocateHandle\r
-  (EFI_LOCATE_DEVICE_PATH)                      CoreLocateDevicePath,                     // LocateDevicePath\r
-  (EFI_INSTALL_CONFIGURATION_TABLE)             CoreInstallConfigurationTable,            // InstallConfigurationTable\r
-  (EFI_IMAGE_LOAD)                              CoreLoadImage,                            // LoadImage\r
-  (EFI_IMAGE_START)                             CoreStartImage,                           // StartImage\r
-  (EFI_EXIT)                                    CoreExit,                                 // Exit\r
-  (EFI_IMAGE_UNLOAD)                            CoreUnloadImage,                          // UnloadImage\r
-  (EFI_EXIT_BOOT_SERVICES)                      CoreExitBootServices,                     // ExitBootServices\r
-  (EFI_GET_NEXT_MONOTONIC_COUNT)                CoreEfiNotAvailableYetArg1,               // GetNextMonotonicCount\r
-  (EFI_STALL)                                   CoreStall,                                // Stall\r
-  (EFI_SET_WATCHDOG_TIMER)                      CoreSetWatchdogTimer,                     // SetWatchdogTimer\r
-  (EFI_CONNECT_CONTROLLER)                      CoreConnectController,                    // ConnectController\r
-  (EFI_DISCONNECT_CONTROLLER)                   CoreDisconnectController,                 // DisconnectController\r
-  (EFI_OPEN_PROTOCOL)                           CoreOpenProtocol,                         // OpenProtocol\r
-  (EFI_CLOSE_PROTOCOL)                          CoreCloseProtocol,                        // CloseProtocol\r
-  (EFI_OPEN_PROTOCOL_INFORMATION)               CoreOpenProtocolInformation,              // OpenProtocolInformation\r
-  (EFI_PROTOCOLS_PER_HANDLE)                    CoreProtocolsPerHandle,                   // ProtocolsPerHandle\r
-  (EFI_LOCATE_HANDLE_BUFFER)                    CoreLocateHandleBuffer,                   // LocateHandleBuffer\r
-  (EFI_LOCATE_PROTOCOL)                         CoreLocateProtocol,                       // LocateProtocol\r
-  (EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES)    CoreInstallMultipleProtocolInterfaces,    // InstallMultipleProtocolInterfaces\r
-  (EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES)  CoreUninstallMultipleProtocolInterfaces,  // UninstallMultipleProtocolInterfaces\r
-  (EFI_CALCULATE_CRC32)                         CoreEfiNotAvailableYetArg3,               // CalculateCrc32\r
-  (EFI_COPY_MEM)                                CopyMem,                                  // CopyMem\r
-  (EFI_SET_MEM)                                 SetMem,                                   // SetMem\r
-  (EFI_CREATE_EVENT_EX)                         CoreCreateEventEx                         // CreateEventEx\r
+  (EFI_RAISE_TPL)CoreRaiseTpl,                                                            // RaiseTPL\r
+  (EFI_RESTORE_TPL)CoreRestoreTpl,                                                        // RestoreTPL\r
+  (EFI_ALLOCATE_PAGES)CoreAllocatePages,                                                  // AllocatePages\r
+  (EFI_FREE_PAGES)CoreFreePages,                                                          // FreePages\r
+  (EFI_GET_MEMORY_MAP)CoreGetMemoryMap,                                                   // GetMemoryMap\r
+  (EFI_ALLOCATE_POOL)CoreAllocatePool,                                                    // AllocatePool\r
+  (EFI_FREE_POOL)CoreFreePool,                                                            // FreePool\r
+  (EFI_CREATE_EVENT)CoreCreateEvent,                                                      // CreateEvent\r
+  (EFI_SET_TIMER)CoreSetTimer,                                                            // SetTimer\r
+  (EFI_WAIT_FOR_EVENT)CoreWaitForEvent,                                                   // WaitForEvent\r
+  (EFI_SIGNAL_EVENT)CoreSignalEvent,                                                      // SignalEvent\r
+  (EFI_CLOSE_EVENT)CoreCloseEvent,                                                        // CloseEvent\r
+  (EFI_CHECK_EVENT)CoreCheckEvent,                                                        // CheckEvent\r
+  (EFI_INSTALL_PROTOCOL_INTERFACE)CoreInstallProtocolInterface,                           // InstallProtocolInterface\r
+  (EFI_REINSTALL_PROTOCOL_INTERFACE)CoreReinstallProtocolInterface,                       // ReinstallProtocolInterface\r
+  (EFI_UNINSTALL_PROTOCOL_INTERFACE)CoreUninstallProtocolInterface,                       // UninstallProtocolInterface\r
+  (EFI_HANDLE_PROTOCOL)CoreHandleProtocol,                                                // HandleProtocol\r
+  (VOID *)NULL,                                                                           // Reserved\r
+  (EFI_REGISTER_PROTOCOL_NOTIFY)CoreRegisterProtocolNotify,                               // RegisterProtocolNotify\r
+  (EFI_LOCATE_HANDLE)CoreLocateHandle,                                                    // LocateHandle\r
+  (EFI_LOCATE_DEVICE_PATH)CoreLocateDevicePath,                                           // LocateDevicePath\r
+  (EFI_INSTALL_CONFIGURATION_TABLE)CoreInstallConfigurationTable,                         // InstallConfigurationTable\r
+  (EFI_IMAGE_LOAD)CoreLoadImage,                                                          // LoadImage\r
+  (EFI_IMAGE_START)CoreStartImage,                                                        // StartImage\r
+  (EFI_EXIT)CoreExit,                                                                     // Exit\r
+  (EFI_IMAGE_UNLOAD)CoreUnloadImage,                                                      // UnloadImage\r
+  (EFI_EXIT_BOOT_SERVICES)CoreExitBootServices,                                           // ExitBootServices\r
+  (EFI_GET_NEXT_MONOTONIC_COUNT)CoreEfiNotAvailableYetArg1,                               // GetNextMonotonicCount\r
+  (EFI_STALL)CoreStall,                                                                   // Stall\r
+  (EFI_SET_WATCHDOG_TIMER)CoreSetWatchdogTimer,                                           // SetWatchdogTimer\r
+  (EFI_CONNECT_CONTROLLER)CoreConnectController,                                          // ConnectController\r
+  (EFI_DISCONNECT_CONTROLLER)CoreDisconnectController,                                    // DisconnectController\r
+  (EFI_OPEN_PROTOCOL)CoreOpenProtocol,                                                    // OpenProtocol\r
+  (EFI_CLOSE_PROTOCOL)CoreCloseProtocol,                                                  // CloseProtocol\r
+  (EFI_OPEN_PROTOCOL_INFORMATION)CoreOpenProtocolInformation,                             // OpenProtocolInformation\r
+  (EFI_PROTOCOLS_PER_HANDLE)CoreProtocolsPerHandle,                                       // ProtocolsPerHandle\r
+  (EFI_LOCATE_HANDLE_BUFFER)CoreLocateHandleBuffer,                                       // LocateHandleBuffer\r
+  (EFI_LOCATE_PROTOCOL)CoreLocateProtocol,                                                // LocateProtocol\r
+  (EFI_INSTALL_MULTIPLE_PROTOCOL_INTERFACES)CoreInstallMultipleProtocolInterfaces,        // InstallMultipleProtocolInterfaces\r
+  (EFI_UNINSTALL_MULTIPLE_PROTOCOL_INTERFACES)CoreUninstallMultipleProtocolInterfaces,    // UninstallMultipleProtocolInterfaces\r
+  (EFI_CALCULATE_CRC32)CoreEfiNotAvailableYetArg3,                                        // CalculateCrc32\r
+  (EFI_COPY_MEM)CopyMem,                                                                  // CopyMem\r
+  (EFI_SET_MEM)SetMem,                                                                    // SetMem\r
+  (EFI_CREATE_EVENT_EX)CoreCreateEventEx                                                  // CreateEventEx\r
 };\r
 \r
-EFI_DXE_SERVICES mDxeServices = {\r
+EFI_DXE_SERVICES  mDxeServices = {\r
   {\r
     DXE_SERVICES_SIGNATURE,                                           // Signature\r
     DXE_SERVICES_REVISION,                                            // Revision\r
     sizeof (DXE_SERVICES),                                            // HeaderSize\r
-    0,                                                                    // CRC32\r
-    0                                                                     // Reserved\r
+    0,                                                                // CRC32\r
+    0                                                                 // Reserved\r
   },\r
-  (EFI_ADD_MEMORY_SPACE)             CoreAddMemorySpace,                  // AddMemorySpace\r
-  (EFI_ALLOCATE_MEMORY_SPACE)        CoreAllocateMemorySpace,             // AllocateMemorySpace\r
-  (EFI_FREE_MEMORY_SPACE)            CoreFreeMemorySpace,                 // FreeMemorySpace\r
-  (EFI_REMOVE_MEMORY_SPACE)          CoreRemoveMemorySpace,               // RemoveMemorySpace\r
-  (EFI_GET_MEMORY_SPACE_DESCRIPTOR)  CoreGetMemorySpaceDescriptor,        // GetMemorySpaceDescriptor\r
-  (EFI_SET_MEMORY_SPACE_ATTRIBUTES)  CoreSetMemorySpaceAttributes,        // SetMemorySpaceAttributes\r
-  (EFI_GET_MEMORY_SPACE_MAP)         CoreGetMemorySpaceMap,               // GetMemorySpaceMap\r
-  (EFI_ADD_IO_SPACE)                 CoreAddIoSpace,                      // AddIoSpace\r
-  (EFI_ALLOCATE_IO_SPACE)            CoreAllocateIoSpace,                 // AllocateIoSpace\r
-  (EFI_FREE_IO_SPACE)                CoreFreeIoSpace,                     // FreeIoSpace\r
-  (EFI_REMOVE_IO_SPACE)              CoreRemoveIoSpace,                   // RemoveIoSpace\r
-  (EFI_GET_IO_SPACE_DESCRIPTOR)      CoreGetIoSpaceDescriptor,            // GetIoSpaceDescriptor\r
-  (EFI_GET_IO_SPACE_MAP)             CoreGetIoSpaceMap,                   // GetIoSpaceMap\r
-  (EFI_DISPATCH)                     CoreDispatcher,                      // Dispatch\r
-  (EFI_SCHEDULE)                     CoreSchedule,                        // Schedule\r
-  (EFI_TRUST)                        CoreTrust,                           // Trust\r
-  (EFI_PROCESS_FIRMWARE_VOLUME)      CoreProcessFirmwareVolume,           // ProcessFirmwareVolume\r
+  (EFI_ADD_MEMORY_SPACE)CoreAddMemorySpace,                               // AddMemorySpace\r
+  (EFI_ALLOCATE_MEMORY_SPACE)CoreAllocateMemorySpace,                     // AllocateMemorySpace\r
+  (EFI_FREE_MEMORY_SPACE)CoreFreeMemorySpace,                             // FreeMemorySpace\r
+  (EFI_REMOVE_MEMORY_SPACE)CoreRemoveMemorySpace,                         // RemoveMemorySpace\r
+  (EFI_GET_MEMORY_SPACE_DESCRIPTOR)CoreGetMemorySpaceDescriptor,          // GetMemorySpaceDescriptor\r
+  (EFI_SET_MEMORY_SPACE_ATTRIBUTES)CoreSetMemorySpaceAttributes,          // SetMemorySpaceAttributes\r
+  (EFI_GET_MEMORY_SPACE_MAP)CoreGetMemorySpaceMap,                        // GetMemorySpaceMap\r
+  (EFI_ADD_IO_SPACE)CoreAddIoSpace,                                       // AddIoSpace\r
+  (EFI_ALLOCATE_IO_SPACE)CoreAllocateIoSpace,                             // AllocateIoSpace\r
+  (EFI_FREE_IO_SPACE)CoreFreeIoSpace,                                     // FreeIoSpace\r
+  (EFI_REMOVE_IO_SPACE)CoreRemoveIoSpace,                                 // RemoveIoSpace\r
+  (EFI_GET_IO_SPACE_DESCRIPTOR)CoreGetIoSpaceDescriptor,                  // GetIoSpaceDescriptor\r
+  (EFI_GET_IO_SPACE_MAP)CoreGetIoSpaceMap,                                // GetIoSpaceMap\r
+  (EFI_DISPATCH)CoreDispatcher,                                           // Dispatch\r
+  (EFI_SCHEDULE)CoreSchedule,                                             // Schedule\r
+  (EFI_TRUST)CoreTrust,                                                   // Trust\r
+  (EFI_PROCESS_FIRMWARE_VOLUME)CoreProcessFirmwareVolume,                 // ProcessFirmwareVolume\r
   (EFI_SET_MEMORY_SPACE_CAPABILITIES)CoreSetMemorySpaceCapabilities,      // SetMemorySpaceCapabilities\r
 };\r
 \r
-EFI_SYSTEM_TABLE mEfiSystemTableTemplate = {\r
+EFI_SYSTEM_TABLE  mEfiSystemTableTemplate = {\r
   {\r
     EFI_SYSTEM_TABLE_SIGNATURE,                                           // Signature\r
     EFI_SYSTEM_TABLE_REVISION,                                            // Revision\r
@@ -142,7 +142,7 @@ EFI_SYSTEM_TABLE mEfiSystemTableTemplate = {
   NULL                                                                    // ConfigurationTable\r
 };\r
 \r
-EFI_RUNTIME_SERVICES mEfiRuntimeServicesTableTemplate = {\r
+EFI_RUNTIME_SERVICES  mEfiRuntimeServicesTableTemplate = {\r
   {\r
     EFI_RUNTIME_SERVICES_SIGNATURE,                               // Signature\r
     EFI_RUNTIME_SERVICES_REVISION,                                // Revision\r
@@ -150,23 +150,23 @@ EFI_RUNTIME_SERVICES mEfiRuntimeServicesTableTemplate = {
     0,                                                            // CRC32\r
     0                                                             // Reserved\r
   },\r
-  (EFI_GET_TIME)                    CoreEfiNotAvailableYetArg2,   // GetTime\r
-  (EFI_SET_TIME)                    CoreEfiNotAvailableYetArg1,   // SetTime\r
-  (EFI_GET_WAKEUP_TIME)             CoreEfiNotAvailableYetArg3,   // GetWakeupTime\r
-  (EFI_SET_WAKEUP_TIME)             CoreEfiNotAvailableYetArg2,   // SetWakeupTime\r
-  (EFI_SET_VIRTUAL_ADDRESS_MAP)     CoreEfiNotAvailableYetArg4,   // SetVirtualAddressMap\r
-  (EFI_CONVERT_POINTER)             CoreEfiNotAvailableYetArg2,   // ConvertPointer\r
-  (EFI_GET_VARIABLE)                CoreEfiNotAvailableYetArg5,   // GetVariable\r
-  (EFI_GET_NEXT_VARIABLE_NAME)      CoreEfiNotAvailableYetArg3,   // GetNextVariableName\r
-  (EFI_SET_VARIABLE)                CoreEfiNotAvailableYetArg5,   // SetVariable\r
-  (EFI_GET_NEXT_HIGH_MONO_COUNT)    CoreEfiNotAvailableYetArg1,   // GetNextHighMonotonicCount\r
-  (EFI_RESET_SYSTEM)                CoreEfiNotAvailableYetArg4,   // ResetSystem\r
-  (EFI_UPDATE_CAPSULE)              CoreEfiNotAvailableYetArg3,   // UpdateCapsule\r
-  (EFI_QUERY_CAPSULE_CAPABILITIES)  CoreEfiNotAvailableYetArg4,   // QueryCapsuleCapabilities\r
-  (EFI_QUERY_VARIABLE_INFO)         CoreEfiNotAvailableYetArg4    // QueryVariableInfo\r
+  (EFI_GET_TIME)CoreEfiNotAvailableYetArg2,                       // GetTime\r
+  (EFI_SET_TIME)CoreEfiNotAvailableYetArg1,                       // SetTime\r
+  (EFI_GET_WAKEUP_TIME)CoreEfiNotAvailableYetArg3,                // GetWakeupTime\r
+  (EFI_SET_WAKEUP_TIME)CoreEfiNotAvailableYetArg2,                // SetWakeupTime\r
+  (EFI_SET_VIRTUAL_ADDRESS_MAP)CoreEfiNotAvailableYetArg4,        // SetVirtualAddressMap\r
+  (EFI_CONVERT_POINTER)CoreEfiNotAvailableYetArg2,                // ConvertPointer\r
+  (EFI_GET_VARIABLE)CoreEfiNotAvailableYetArg5,                   // GetVariable\r
+  (EFI_GET_NEXT_VARIABLE_NAME)CoreEfiNotAvailableYetArg3,         // GetNextVariableName\r
+  (EFI_SET_VARIABLE)CoreEfiNotAvailableYetArg5,                   // SetVariable\r
+  (EFI_GET_NEXT_HIGH_MONO_COUNT)CoreEfiNotAvailableYetArg1,       // GetNextHighMonotonicCount\r
+  (EFI_RESET_SYSTEM)CoreEfiNotAvailableYetArg4,                   // ResetSystem\r
+  (EFI_UPDATE_CAPSULE)CoreEfiNotAvailableYetArg3,                 // UpdateCapsule\r
+  (EFI_QUERY_CAPSULE_CAPABILITIES)CoreEfiNotAvailableYetArg4,     // QueryCapsuleCapabilities\r
+  (EFI_QUERY_VARIABLE_INFO)CoreEfiNotAvailableYetArg4             // QueryVariableInfo\r
 };\r
 \r
-EFI_RUNTIME_ARCH_PROTOCOL gRuntimeTemplate = {\r
+EFI_RUNTIME_ARCH_PROTOCOL  gRuntimeTemplate = {\r
   INITIALIZE_LIST_HEAD_VARIABLE (gRuntimeTemplate.ImageHead),\r
   INITIALIZE_LIST_HEAD_VARIABLE (gRuntimeTemplate.EventHead),\r
 \r
@@ -184,24 +184,24 @@ EFI_RUNTIME_ARCH_PROTOCOL gRuntimeTemplate = {
   FALSE\r
 };\r
 \r
-EFI_RUNTIME_ARCH_PROTOCOL *gRuntime = &gRuntimeTemplate;\r
+EFI_RUNTIME_ARCH_PROTOCOL  *gRuntime = &gRuntimeTemplate;\r
 \r
 //\r
 // DXE Core Global Variables for the EFI System Table, Boot Services Table,\r
 // DXE Services Table, and Runtime Services Table\r
 //\r
-EFI_DXE_SERVICES      *gDxeCoreDS = &mDxeServices;\r
-EFI_SYSTEM_TABLE      *gDxeCoreST = NULL;\r
+EFI_DXE_SERVICES  *gDxeCoreDS = &mDxeServices;\r
+EFI_SYSTEM_TABLE  *gDxeCoreST = NULL;\r
 \r
 //\r
 // For debug initialize gDxeCoreRT to template. gDxeCoreRT must be allocated from RT memory\r
 //  but gDxeCoreRT is used for ASSERT () and DEBUG () type macros so lets give it\r
 //  a value that will not cause debug infrastructure to crash early on.\r
 //\r
-EFI_RUNTIME_SERVICES  *gDxeCoreRT = &mEfiRuntimeServicesTableTemplate;\r
+EFI_RUNTIME_SERVICES  *gDxeCoreRT         = &mEfiRuntimeServicesTableTemplate;\r
 EFI_HANDLE            gDxeCoreImageHandle = NULL;\r
 \r
-BOOLEAN               gMemoryMapTerminated = FALSE;\r
+BOOLEAN  gMemoryMapTerminated = FALSE;\r
 \r
 //\r
 // EFI Decompress Protocol\r
@@ -215,7 +215,7 @@ EFI_DECOMPRESS_PROTOCOL  gEfiDecompress = {
 // For Loading modules at fixed address feature, the configuration table is to cache the top address below which to load\r
 // Runtime code&boot time code\r
 //\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    gLoadModuleAtFixAddressConfigurationTable = {0, 0};\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE  gLoadModuleAtFixAddressConfigurationTable = { 0, 0 };\r
 \r
 // Main entry point to the DXE Core\r
 //\r
@@ -231,7 +231,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_LOAD_FIXED_ADDRESS_CONFIGURATION_TABLE    gLoa
 VOID\r
 EFIAPI\r
 DxeMain (\r
-  IN  VOID *HobStart\r
+  IN  VOID  *HobStart\r
   )\r
 {\r
   EFI_STATUS                    Status;\r
@@ -248,10 +248,11 @@ DxeMain (
   // Setup the default exception handlers\r
   //\r
   VectorInfoList = NULL;\r
-  GuidHob = GetNextGuidHob (&gEfiVectorHandoffInfoPpiGuid, HobStart);\r
+  GuidHob        = GetNextGuidHob (&gEfiVectorHandoffInfoPpiGuid, HobStart);\r
   if (GuidHob != NULL) {\r
-    VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *) (GET_GUID_HOB_DATA(GuidHob));\r
+    VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *)(GET_GUID_HOB_DATA (GuidHob));\r
   }\r
+\r
   Status = InitializeCpuExceptionHandlersEx (VectorInfoList, NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -295,7 +296,7 @@ DxeMain (
   // Call constructor for all libraries\r
   //\r
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST);\r
-  PERF_CROSSMODULE_END   ("PEI");\r
+  PERF_CROSSMODULE_END ("PEI");\r
   PERF_CROSSMODULE_BEGIN ("DXE");\r
 \r
   //\r
@@ -303,22 +304,28 @@ DxeMain (
   // CoreInitializeMemoryServices()), now that library constructors have\r
   // executed.\r
   //\r
-  DEBUG ((DEBUG_INFO, "%a: MemoryBaseAddress=0x%Lx MemoryLength=0x%Lx\n",\r
-    __FUNCTION__, MemoryBaseAddress, MemoryLength));\r
+  DEBUG ((\r
+    DEBUG_INFO,\r
+    "%a: MemoryBaseAddress=0x%Lx MemoryLength=0x%Lx\n",\r
+    __FUNCTION__,\r
+    MemoryBaseAddress,\r
+    MemoryLength\r
+    ));\r
 \r
   //\r
   // Report DXE Core image information to the PE/COFF Extra Action Library\r
   //\r
   ZeroMem (&ImageContext, sizeof (ImageContext));\r
-  ImageContext.ImageAddress   = (EFI_PHYSICAL_ADDRESS)(UINTN)gDxeCoreLoadedImage->ImageBase;\r
-  ImageContext.PdbPointer     = PeCoffLoaderGetPdbPointer ((VOID*)(UINTN)ImageContext.ImageAddress);\r
-  ImageContext.SizeOfHeaders  = PeCoffGetSizeOfHeaders ((VOID*)(UINTN)ImageContext.ImageAddress);\r
-  Status = PeCoffLoaderGetEntryPoint ((VOID*)(UINTN)ImageContext.ImageAddress, &EntryPoint);\r
+  ImageContext.ImageAddress  = (EFI_PHYSICAL_ADDRESS)(UINTN)gDxeCoreLoadedImage->ImageBase;\r
+  ImageContext.PdbPointer    = PeCoffLoaderGetPdbPointer ((VOID *)(UINTN)ImageContext.ImageAddress);\r
+  ImageContext.SizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)ImageContext.ImageAddress);\r
+  Status                     = PeCoffLoaderGetEntryPoint ((VOID *)(UINTN)ImageContext.ImageAddress, &EntryPoint);\r
   if (Status == EFI_SUCCESS) {\r
     ImageContext.EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)EntryPoint;\r
   }\r
-  ImageContext.Handle         = (VOID *)(UINTN)gDxeCoreLoadedImage->ImageBase;\r
-  ImageContext.ImageRead      = PeCoffLoaderImageReadFromMemory;\r
+\r
+  ImageContext.Handle    = (VOID *)(UINTN)gDxeCoreLoadedImage->ImageBase;\r
+  ImageContext.ImageRead = PeCoffLoaderImageReadFromMemory;\r
   PeCoffLoaderRelocateImageExtraAction (&ImageContext);\r
 \r
   //\r
@@ -344,10 +351,11 @@ DxeMain (
   // Configuration Table so that user could easily to retrieve the top address to load Dxe and PEI\r
   // Code and Tseg base to load SMM driver.\r
   //\r
-  if (PcdGet64(PcdLoadModuleAtFixAddressEnable) != 0) {\r
+  if (PcdGet64 (PcdLoadModuleAtFixAddressEnable) != 0) {\r
     Status = CoreInstallConfigurationTable (&gLoadFixedAddressConfigurationTableGuid, &gLoadModuleAtFixAddressConfigurationTable);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   //\r
   // Report Status Code here for DXE_ENTRY_POINT once it is available\r
   //\r
@@ -371,56 +379,61 @@ DxeMain (
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "HOBLIST address in DXE = 0x%p\n", HobStart));\r
 \r
   DEBUG_CODE_BEGIN ();\r
-    EFI_PEI_HOB_POINTERS               Hob;\r
-\r
-    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
-      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
-        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Memory Allocation 0x%08x 0x%0lx - 0x%0lx\n", \\r
-          Hob.MemoryAllocation->AllocDescriptor.MemoryType,                      \\r
-          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress,               \\r
-          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress + Hob.MemoryAllocation->AllocDescriptor.MemoryLength - 1));\r
-      }\r
+  EFI_PEI_HOB_POINTERS  Hob;\r
+\r
+  for (Hob.Raw = HobStart; !END_OF_HOB_LIST (Hob); Hob.Raw = GET_NEXT_HOB (Hob)) {\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
+      DEBUG ((\r
+        DEBUG_INFO | DEBUG_LOAD,\r
+        "Memory Allocation 0x%08x 0x%0lx - 0x%0lx\n", \\r
+        Hob.MemoryAllocation->AllocDescriptor.MemoryType,                      \\r
+        Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress,               \\r
+        Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress + Hob.MemoryAllocation->AllocDescriptor.MemoryLength - 1\r
+        ));\r
     }\r
-    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
-      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
-        DEBUG ((\r
-          DEBUG_INFO | DEBUG_LOAD,\r
-          "FV Hob            0x%0lx - 0x%0lx\n",\r
-          Hob.FirmwareVolume->BaseAddress,\r
-          Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume->Length - 1\r
-          ));\r
-      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
-        DEBUG ((\r
-          DEBUG_INFO | DEBUG_LOAD,\r
-          "FV2 Hob           0x%0lx - 0x%0lx\n",\r
-          Hob.FirmwareVolume2->BaseAddress,\r
-          Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1\r
-          ));\r
+  }\r
+\r
+  for (Hob.Raw = HobStart; !END_OF_HOB_LIST (Hob); Hob.Raw = GET_NEXT_HOB (Hob)) {\r
+    if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
+      DEBUG ((\r
+        DEBUG_INFO | DEBUG_LOAD,\r
+        "FV Hob            0x%0lx - 0x%0lx\n",\r
+        Hob.FirmwareVolume->BaseAddress,\r
+        Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume->Length - 1\r
+        ));\r
+    } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
+      DEBUG ((\r
+        DEBUG_INFO | DEBUG_LOAD,\r
+        "FV2 Hob           0x%0lx - 0x%0lx\n",\r
+        Hob.FirmwareVolume2->BaseAddress,\r
+        Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1\r
+        ));\r
+      DEBUG ((\r
+        DEBUG_INFO | DEBUG_LOAD,\r
+        "                  %g - %g\n",\r
+        &Hob.FirmwareVolume2->FvName,\r
+        &Hob.FirmwareVolume2->FileName\r
+        ));\r
+    } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV3) {\r
+      DEBUG ((\r
+        DEBUG_INFO | DEBUG_LOAD,\r
+        "FV3 Hob           0x%0lx - 0x%0lx - 0x%x - 0x%x\n",\r
+        Hob.FirmwareVolume3->BaseAddress,\r
+        Hob.FirmwareVolume3->BaseAddress + Hob.FirmwareVolume3->Length - 1,\r
+        Hob.FirmwareVolume3->AuthenticationStatus,\r
+        Hob.FirmwareVolume3->ExtractedFv\r
+        ));\r
+      if (Hob.FirmwareVolume3->ExtractedFv) {\r
         DEBUG ((\r
           DEBUG_INFO | DEBUG_LOAD,\r
           "                  %g - %g\n",\r
-          &Hob.FirmwareVolume2->FvName,\r
-          &Hob.FirmwareVolume2->FileName\r
-          ));\r
-      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV3) {\r
-        DEBUG ((\r
-          DEBUG_INFO | DEBUG_LOAD,\r
-          "FV3 Hob           0x%0lx - 0x%0lx - 0x%x - 0x%x\n",\r
-          Hob.FirmwareVolume3->BaseAddress,\r
-          Hob.FirmwareVolume3->BaseAddress + Hob.FirmwareVolume3->Length - 1,\r
-          Hob.FirmwareVolume3->AuthenticationStatus,\r
-          Hob.FirmwareVolume3->ExtractedFv\r
+          &Hob.FirmwareVolume3->FvName,\r
+          &Hob.FirmwareVolume3->FileName\r
           ));\r
-        if (Hob.FirmwareVolume3->ExtractedFv) {\r
-          DEBUG ((\r
-            DEBUG_INFO | DEBUG_LOAD,\r
-            "                  %g - %g\n",\r
-            &Hob.FirmwareVolume3->FvName,\r
-            &Hob.FirmwareVolume3->FileName\r
-            ));\r
-        }\r
       }\r
     }\r
+  }\r
+\r
   DEBUG_CODE_END ();\r
 \r
   //\r
@@ -440,16 +453,17 @@ DxeMain (
   //\r
   GuidHob = GetNextGuidHob (&gEfiVectorHandoffInfoPpiGuid, HobStart);\r
   if (GuidHob != NULL) {\r
-    VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *) (GET_GUID_HOB_DATA(GuidHob));\r
-    VectorInfo = VectorInfoList;\r
-    Index = 1;\r
+    VectorInfoList = (EFI_VECTOR_HANDOFF_INFO *)(GET_GUID_HOB_DATA (GuidHob));\r
+    VectorInfo     = VectorInfoList;\r
+    Index          = 1;\r
     while (VectorInfo->Attribute != EFI_VECTOR_HANDOFF_LAST_ENTRY) {\r
-      VectorInfo ++;\r
-      Index ++;\r
+      VectorInfo++;\r
+      Index++;\r
     }\r
-    VectorInfo = AllocateCopyPool (sizeof (EFI_VECTOR_HANDOFF_INFO) * Index, (VOID *) VectorInfoList);\r
+\r
+    VectorInfo = AllocateCopyPool (sizeof (EFI_VECTOR_HANDOFF_INFO) * Index, (VOID *)VectorInfoList);\r
     ASSERT (VectorInfo != NULL);\r
-    Status = CoreInstallConfigurationTable (&gEfiVectorHandoffTableGuid, (VOID *) VectorInfo);\r
+    Status = CoreInstallConfigurationTable (&gEfiVectorHandoffTableGuid, (VOID *)VectorInfo);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r
@@ -470,7 +484,8 @@ DxeMain (
   //\r
   Status = CoreInstallMultipleProtocolInterfaces (\r
              &mDecompressHandle,\r
-             &gEfiDecompressProtocolGuid,           &gEfiDecompress,\r
+             &gEfiDecompressProtocolGuid,\r
+             &gEfiDecompress,\r
              NULL\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
@@ -511,7 +526,7 @@ DxeMain (
   // Display Architectural protocols that were not loaded if this is DEBUG build\r
   //\r
   DEBUG_CODE_BEGIN ();\r
-    CoreDisplayMissingArchProtocols ();\r
+  CoreDisplayMissingArchProtocols ();\r
   DEBUG_CODE_END ();\r
 \r
   //\r
@@ -519,14 +534,14 @@ DxeMain (
   // evaluated to false if this is a debug build\r
   //\r
   DEBUG_CODE_BEGIN ();\r
-    CoreDisplayDiscoveredNotDispatched ();\r
+  CoreDisplayDiscoveredNotDispatched ();\r
   DEBUG_CODE_END ();\r
 \r
   //\r
   // Assert if the Architectural Protocols are not present.\r
   //\r
   Status = CoreAllEfiServicesAvailable ();\r
-  if (EFI_ERROR(Status)) {\r
+  if (EFI_ERROR (Status)) {\r
     //\r
     // Report Status code that some Architectural Protocols are not present.\r
     //\r
@@ -535,6 +550,7 @@ DxeMain (
       (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_EC_NO_ARCH)\r
       );\r
   }\r
+\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -559,9 +575,6 @@ DxeMain (
   UNREACHABLE ();\r
 }\r
 \r
-\r
-\r
-\r
 /**\r
   Place holder function until all the Boot Services and Runtime Services are\r
   available.\r
@@ -574,7 +587,7 @@ DxeMain (
 EFI_STATUS\r
 EFIAPI\r
 CoreEfiNotAvailableYetArg1 (\r
-  UINTN Arg1\r
+  UINTN  Arg1\r
   )\r
 {\r
   //\r
@@ -586,7 +599,6 @@ CoreEfiNotAvailableYetArg1 (
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 \r
-\r
 /**\r
   Place holder function until all the Boot Services and Runtime Services are available.\r
 \r
@@ -599,8 +611,8 @@ CoreEfiNotAvailableYetArg1 (
 EFI_STATUS\r
 EFIAPI\r
 CoreEfiNotAvailableYetArg2 (\r
-  UINTN Arg1,\r
-  UINTN Arg2\r
+  UINTN  Arg1,\r
+  UINTN  Arg2\r
   )\r
 {\r
   //\r
@@ -612,7 +624,6 @@ CoreEfiNotAvailableYetArg2 (
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 \r
-\r
 /**\r
   Place holder function until all the Boot Services and Runtime Services are available.\r
 \r
@@ -626,9 +637,9 @@ CoreEfiNotAvailableYetArg2 (
 EFI_STATUS\r
 EFIAPI\r
 CoreEfiNotAvailableYetArg3 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3\r
+  UINTN  Arg1,\r
+  UINTN  Arg2,\r
+  UINTN  Arg3\r
   )\r
 {\r
   //\r
@@ -640,7 +651,6 @@ CoreEfiNotAvailableYetArg3 (
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 \r
-\r
 /**\r
   Place holder function until all the Boot Services and Runtime Services are available.\r
 \r
@@ -655,10 +665,10 @@ CoreEfiNotAvailableYetArg3 (
 EFI_STATUS\r
 EFIAPI\r
 CoreEfiNotAvailableYetArg4 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3,\r
-  UINTN Arg4\r
+  UINTN  Arg1,\r
+  UINTN  Arg2,\r
+  UINTN  Arg3,\r
+  UINTN  Arg4\r
   )\r
 {\r
   //\r
@@ -670,7 +680,6 @@ CoreEfiNotAvailableYetArg4 (
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 \r
-\r
 /**\r
   Place holder function until all the Boot Services and Runtime Services are available.\r
 \r
@@ -686,11 +695,11 @@ CoreEfiNotAvailableYetArg4 (
 EFI_STATUS\r
 EFIAPI\r
 CoreEfiNotAvailableYetArg5 (\r
-  UINTN Arg1,\r
-  UINTN Arg2,\r
-  UINTN Arg3,\r
-  UINTN Arg4,\r
-  UINTN Arg5\r
+  UINTN  Arg1,\r
+  UINTN  Arg2,\r
+  UINTN  Arg3,\r
+  UINTN  Arg4,\r
+  UINTN  Arg5\r
   )\r
 {\r
   //\r
@@ -702,7 +711,6 @@ CoreEfiNotAvailableYetArg5 (
   return EFI_NOT_AVAILABLE_YET;\r
 }\r
 \r
-\r
 /**\r
   Calcualte the 32-bit CRC in a EFI table using the service provided by the\r
   gRuntime service.\r
@@ -712,10 +720,10 @@ CoreEfiNotAvailableYetArg5 (
 **/\r
 VOID\r
 CalculateEfiHdrCrc (\r
-  IN  OUT EFI_TABLE_HEADER    *Hdr\r
+  IN  OUT EFI_TABLE_HEADER  *Hdr\r
   )\r
 {\r
-  UINT32 Crc;\r
+  UINT32  Crc;\r
 \r
   Hdr->CRC32 = 0;\r
 \r
@@ -728,7 +736,6 @@ CalculateEfiHdrCrc (
   Hdr->CRC32 = Crc;\r
 }\r
 \r
-\r
 /**\r
   Terminates all boot services.\r
 \r
@@ -742,11 +749,11 @@ CalculateEfiHdrCrc (
 EFI_STATUS\r
 EFIAPI\r
 CoreExitBootServices (\r
-  IN EFI_HANDLE   ImageHandle,\r
-  IN UINTN        MapKey\r
+  IN EFI_HANDLE  ImageHandle,\r
+  IN UINTN       MapKey\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Disable Timer\r
@@ -780,7 +787,7 @@ CoreExitBootServices (
     (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)\r
     );\r
 \r
-  MemoryProtectionExitBootServicesCallback();\r
+  MemoryProtectionExitBootServicesCallback ();\r
 \r
   //\r
   // Disable interrupt of Debug timer.\r
@@ -822,7 +829,6 @@ CoreExitBootServices (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Given a compressed source buffer, this function retrieves the size of the\r
   uncompressed buffer and the size of the scratch buffer required to decompress\r
@@ -865,20 +871,20 @@ CoreExitBootServices (
 EFI_STATUS\r
 EFIAPI\r
 DxeMainUefiDecompressGetInfo (\r
-  IN EFI_DECOMPRESS_PROTOCOL            *This,\r
-  IN   VOID                             *Source,\r
-  IN   UINT32                           SourceSize,\r
-  OUT  UINT32                           *DestinationSize,\r
-  OUT  UINT32                           *ScratchSize\r
+  IN EFI_DECOMPRESS_PROTOCOL  *This,\r
+  IN   VOID                   *Source,\r
+  IN   UINT32                 SourceSize,\r
+  OUT  UINT32                 *DestinationSize,\r
+  OUT  UINT32                 *ScratchSize\r
   )\r
 {\r
-  if (Source == NULL || DestinationSize == NULL || ScratchSize == NULL) {\r
+  if ((Source == NULL) || (DestinationSize == NULL) || (ScratchSize == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   return UefiDecompressGetInfo (Source, SourceSize, DestinationSize, ScratchSize);\r
 }\r
 \r
-\r
 /**\r
   Decompresses a compressed source buffer.\r
 \r
@@ -916,20 +922,20 @@ DxeMainUefiDecompressGetInfo (
 EFI_STATUS\r
 EFIAPI\r
 DxeMainUefiDecompress (\r
-  IN     EFI_DECOMPRESS_PROTOCOL          *This,\r
-  IN     VOID                             *Source,\r
-  IN     UINT32                           SourceSize,\r
-  IN OUT VOID                             *Destination,\r
-  IN     UINT32                           DestinationSize,\r
-  IN OUT VOID                             *Scratch,\r
-  IN     UINT32                           ScratchSize\r
+  IN     EFI_DECOMPRESS_PROTOCOL  *This,\r
+  IN     VOID                     *Source,\r
+  IN     UINT32                   SourceSize,\r
+  IN OUT VOID                     *Destination,\r
+  IN     UINT32                   DestinationSize,\r
+  IN OUT VOID                     *Scratch,\r
+  IN     UINT32                   ScratchSize\r
   )\r
 {\r
   EFI_STATUS  Status;\r
   UINT32      TestDestinationSize;\r
   UINT32      TestScratchSize;\r
 \r
-  if (Source == NULL || Destination== NULL || Scratch == NULL) {\r
+  if ((Source == NULL) || (Destination == NULL) || (Scratch == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -938,7 +944,7 @@ DxeMainUefiDecompress (
     return Status;\r
   }\r
 \r
-  if (ScratchSize < TestScratchSize || DestinationSize < TestDestinationSize) {\r
+  if ((ScratchSize < TestScratchSize) || (DestinationSize < TestDestinationSize)) {\r
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r