ArmPlatformPkg: Apply uncrustify changes

[mirror_edk2.git] / ArmPlatformPkg / PlatformPei / PlatformPeim.c

diff --git a/ArmPlatformPkg/PlatformPei/PlatformPeim.c b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
old mode 100755 (executable)
new mode 100644 (file)
index 58ecb31..62d1faf
--- a/ArmPlatformPkg/PlatformPei/PlatformPeim.c
+++ b/ArmPlatformPkg/PlatformPei/PlatformPeim.c
@@ -1,23 +1,16 @@
 /** @file\r
-*\r
-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*\r
-*  This program and the accompanying materials\r
-*  are licensed and made available under the terms and conditions of the BSD License\r
-*  which accompanies this distribution.  The full text of the license may be found at\r
-*  http://opensource.org/licenses/bsd-license.php\r
-*\r
-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-*\r
+\r
+  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
 **/\r
 \r
 #include <PiPei.h>\r
 \r
 //\r
-// The protocols, PPI and GUID defintions for this module\r
+// The protocols, PPI and GUID definitions for this module\r
 //\r
-#include <Ppi/ArmGlobalVariable.h>\r
 #include <Ppi/MasterBootMode.h>\r
 #include <Ppi/BootInRecoveryMode.h>\r
 #include <Ppi/GuidedSectionExtraction.h>\r
@@ -32,8 +25,6 @@
 #include <Library/PeiServicesLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
-#include <Guid/ArmGlobalVariableHob.h>\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 InitializePlatformPeim (\r
@@ -62,24 +53,6 @@ CONST EFI_PEI_PPI_DESCRIPTOR  mPpiListRecoveryBootMode = {
   NULL\r
 };\r
 \r
-VOID\r
-EFIAPI\r
-BuildGlobalVariableHob (\r
-  IN EFI_PHYSICAL_ADDRESS         GlobalVariableBase,\r
-  IN UINT32                       GlobalVariableSize\r
-  )\r
-{\r
-  EFI_STATUS                Status;\r
-  ARM_HOB_GLOBAL_VARIABLE   *Hob;\r
-\r
-  Status = PeiServicesCreateHob (EFI_HOB_TYPE_GUID_EXTENSION, sizeof (ARM_HOB_GLOBAL_VARIABLE), (VOID**)&Hob);\r
-  if (!EFI_ERROR(Status)) {\r
-    CopyGuid (&(Hob->Header.Name), &gArmGlobalVariableGuid);\r
-    Hob->GlobalVariableBase = GlobalVariableBase;\r
-    Hob->GlobalVariableSize = GlobalVariableSize;\r
-  }\r
-}\r
-\r
 /*++\r
 \r
 Routine Description:\r
@@ -103,34 +76,24 @@ InitializePlatformPeim (
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  UINTN                         BootMode;\r
-  ARM_GLOBAL_VARIABLE_PPI       *ArmGlobalVariablePpi;\r
-  EFI_PHYSICAL_ADDRESS          GlobalVariableBase;\r
+  EFI_STATUS     Status;\r
+  EFI_BOOT_MODE  BootMode;\r
 \r
-  DEBUG ((EFI_D_LOAD | EFI_D_INFO, "Platform PEIM Loaded\n"));\r
-\r
-  PlatformPeim ();\r
+  DEBUG ((DEBUG_LOAD | DEBUG_INFO, "Platform PEIM Loaded\n"));\r
 \r
-  Status = PeiServicesLocatePpi (&gArmGlobalVariablePpiGuid, 0, NULL, (VOID**)&ArmGlobalVariablePpi);\r
-  if (!EFI_ERROR(Status)) {\r
-    Status = ArmGlobalVariablePpi->GetGlobalVariableMemory (&GlobalVariableBase);\r
+  Status = PeiServicesSetBootMode (ArmPlatformGetBootMode ());\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
-    if (!EFI_ERROR(Status)) {\r
-      // Declare the Global Variable HOB\r
-      BuildGlobalVariableHob (GlobalVariableBase, FixedPcdGet32 (PcdPeiGlobalVariableSize));\r
-    }\r
-  }\r
+  PlatformPeim ();\r
 \r
-  BootMode  = ArmPlatformGetBootMode ();\r
-  Status    = (**PeiServices).SetBootMode (PeiServices, (UINT8) BootMode);\r
+  Status = PeiServicesGetBootMode (&BootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListBootMode);\r
+  Status = PeiServicesInstallPpi (&mPpiListBootMode);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   if (BootMode == BOOT_IN_RECOVERY_MODE) {\r
-    Status = (**PeiServices).InstallPpi (PeiServices, &mPpiListRecoveryBootMode);\r
+    Status = PeiServicesInstallPpi (&mPpiListRecoveryBootMode);\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
 \r