]> git.proxmox.com Git - mirror_edk2.git/blobdiff - OvmfPkg/PlatformDxe/Platform.c
OvmfPkg: Apply uncrustify changes
[mirror_edk2.git] / OvmfPkg / PlatformDxe / Platform.c
index f2e51960ce8b7c1d00fe76764598e1f55fd5cea8..69a7ecb83d03fc474175210ed2e7b224b7749283 100644 (file)
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  VENDOR_DEVICE_PATH       VendorDevicePath;\r
-  EFI_DEVICE_PATH_PROTOCOL End;\r
+  VENDOR_DEVICE_PATH          VendorDevicePath;\r
+  EFI_DEVICE_PATH_PROTOCOL    End;\r
 } PKG_DEVICE_PATH;\r
 #pragma pack()\r
 \r
-STATIC PKG_DEVICE_PATH mPkgDevicePath = {\r
+STATIC PKG_DEVICE_PATH  mPkgDevicePath = {\r
   {\r
     {\r
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)     ),\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH) >> 8)\r
       }\r
     },\r
     EFI_CALLER_ID_GUID\r
@@ -65,8 +65,8 @@ STATIC PKG_DEVICE_PATH mPkgDevicePath = {
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH     ),\r
-      (UINT8) (END_DEVICE_PATH_LENGTH >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)(END_DEVICE_PATH_LENGTH >> 8)\r
     }\r
   }\r
 };\r
@@ -75,12 +75,12 @@ STATIC PKG_DEVICE_PATH mPkgDevicePath = {
 // The configuration interface between the HII engine (form display etc) and\r
 // this driver.\r
 //\r
-STATIC EFI_HII_CONFIG_ACCESS_PROTOCOL mConfigAccess;\r
+STATIC EFI_HII_CONFIG_ACCESS_PROTOCOL  mConfigAccess;\r
 \r
 //\r
 // The handle representing our list of packages after installation.\r
 //\r
-STATIC EFI_HII_HANDLE mInstalledPackages;\r
+STATIC EFI_HII_HANDLE  mInstalledPackages;\r
 \r
 //\r
 // The arrays below constitute our HII package list. They are auto-generated by\r
@@ -93,32 +93,31 @@ STATIC EFI_HII_HANDLE mInstalledPackages;
 //   plus "Bin".\r
 //\r
 //\r
-extern UINT8 PlatformDxeStrings[];\r
-extern UINT8 PlatformFormsBin[];\r
+extern UINT8  PlatformDxeStrings[];\r
+extern UINT8  PlatformFormsBin[];\r
 \r
 //\r
 // We want to be notified about GOP installations until we find one GOP\r
 // interface that lets us populate the form.\r
 //\r
-STATIC EFI_EVENT mGopEvent;\r
+STATIC EFI_EVENT  mGopEvent;\r
 \r
 //\r
 // The registration record underneath this pointer allows us to iterate through\r
 // the GOP instances one by one.\r
 //\r
-STATIC VOID *mGopTracker;\r
+STATIC VOID  *mGopTracker;\r
 \r
 //\r
 // Cache the resolutions we get from the GOP.\r
 //\r
 typedef struct {\r
-  UINT32 X;\r
-  UINT32 Y;\r
+  UINT32    X;\r
+  UINT32    Y;\r
 } GOP_MODE;\r
 \r
-STATIC UINTN    mNumGopModes;\r
-STATIC GOP_MODE *mGopModes;\r
-\r
+STATIC UINTN     mNumGopModes;\r
+STATIC GOP_MODE  *mGopModes;\r
 \r
 /**\r
   Load the persistent platform configuration and translate it to binary form\r
@@ -136,63 +135,66 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PlatformConfigToFormState (\r
-  OUT MAIN_FORM_STATE *MainFormState\r
+  OUT MAIN_FORM_STATE  *MainFormState\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  UINT64          OptionalElements;\r
-  UINTN           ModeNumber;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  UINT64           OptionalElements;\r
+  UINTN            ModeNumber;\r
 \r
   ZeroMem (MainFormState, sizeof *MainFormState);\r
 \r
   Status = PlatformConfigLoad (&PlatformConfig, &OptionalElements);\r
   switch (Status) {\r
-  case EFI_SUCCESS:\r
-    if (OptionalElements & PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION) {\r
-      //\r
-      // Format the preferred resolution as text.\r
-      //\r
-      UnicodeSPrintAsciiFormat (\r
-        (CHAR16 *) MainFormState->CurrentPreferredResolution,\r
-        sizeof MainFormState->CurrentPreferredResolution,\r
-        "%Ldx%Ld",\r
-        (INT64) PlatformConfig.HorizontalResolution,\r
-        (INT64) PlatformConfig.VerticalResolution);\r
-\r
-      //\r
-      // Try to locate it in the drop-down list too. This may not succeed, but\r
-      // that's fine.\r
-      //\r
-      for (ModeNumber = 0; ModeNumber < mNumGopModes; ++ModeNumber) {\r
-        if (mGopModes[ModeNumber].X == PlatformConfig.HorizontalResolution &&\r
-            mGopModes[ModeNumber].Y == PlatformConfig.VerticalResolution) {\r
-          MainFormState->NextPreferredResolution = (UINT32) ModeNumber;\r
-          break;\r
+    case EFI_SUCCESS:\r
+      if (OptionalElements & PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION) {\r
+        //\r
+        // Format the preferred resolution as text.\r
+        //\r
+        UnicodeSPrintAsciiFormat (\r
+          (CHAR16 *)MainFormState->CurrentPreferredResolution,\r
+          sizeof MainFormState->CurrentPreferredResolution,\r
+          "%Ldx%Ld",\r
+          (INT64)PlatformConfig.HorizontalResolution,\r
+          (INT64)PlatformConfig.VerticalResolution\r
+          );\r
+\r
+        //\r
+        // Try to locate it in the drop-down list too. This may not succeed, but\r
+        // that's fine.\r
+        //\r
+        for (ModeNumber = 0; ModeNumber < mNumGopModes; ++ModeNumber) {\r
+          if ((mGopModes[ModeNumber].X == PlatformConfig.HorizontalResolution) &&\r
+              (mGopModes[ModeNumber].Y == PlatformConfig.VerticalResolution))\r
+          {\r
+            MainFormState->NextPreferredResolution = (UINT32)ModeNumber;\r
+            break;\r
+          }\r
         }\r
+\r
+        break;\r
       }\r
 \r
-      break;\r
-    }\r
     //\r
     // fall through otherwise\r
     //\r
 \r
-  case EFI_NOT_FOUND:\r
-    UnicodeSPrintAsciiFormat (\r
-      (CHAR16 *) MainFormState->CurrentPreferredResolution,\r
-      sizeof MainFormState->CurrentPreferredResolution,\r
-      "Unset");\r
-    break;\r
+    case EFI_NOT_FOUND:\r
+      UnicodeSPrintAsciiFormat (\r
+        (CHAR16 *)MainFormState->CurrentPreferredResolution,\r
+        sizeof MainFormState->CurrentPreferredResolution,\r
+        "Unset"\r
+        );\r
+      break;\r
 \r
-  default:\r
-    return Status;\r
+    default:\r
+      return Status;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   This function is called by the HII machinery when it fetches the form state.\r
 \r
@@ -223,10 +225,10 @@ ExtractConfig (
   IN CONST  EFI_STRING                      Request,\r
   OUT       EFI_STRING                      *Progress,\r
   OUT       EFI_STRING                      *Results\r
-)\r
+  )\r
 {\r
-  MAIN_FORM_STATE MainFormState;\r
-  EFI_STATUS      Status;\r
+  MAIN_FORM_STATE  MainFormState;\r
+  EFI_STATUS       Status;\r
 \r
   DEBUG ((DEBUG_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request));\r
 \r
@@ -239,19 +241,29 @@ ExtractConfig (
   //\r
   // Answer the textual request keying off the binary form state.\r
   //\r
-  Status = gHiiConfigRouting->BlockToConfig (gHiiConfigRouting, Request,\r
-                                (VOID *) &MainFormState, sizeof MainFormState,\r
-                                Results, Progress);\r
+  Status = gHiiConfigRouting->BlockToConfig (\r
+                                gHiiConfigRouting,\r
+                                Request,\r
+                                (VOID *)&MainFormState,\r
+                                sizeof MainFormState,\r
+                                Results,\r
+                                Progress\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: BlockToConfig(): %r, Progress=\"%s\"\n",\r
-      __FUNCTION__, Status, (Status == EFI_DEVICE_ERROR) ? NULL : *Progress));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: BlockToConfig(): %r, Progress=\"%s\"\n",\r
+      __FUNCTION__,\r
+      Status,\r
+      (Status == EFI_DEVICE_ERROR) ? NULL : *Progress\r
+      ));\r
   } else {\r
     DEBUG ((DEBUG_VERBOSE, "%a: Results=\"%s\"\n", __FUNCTION__, *Results));\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Interpret the binary form state and save it as persistent platform\r
   configuration.\r
@@ -265,12 +277,12 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 FormStateToPlatformConfig (\r
-  IN CONST MAIN_FORM_STATE *MainFormState\r
+  IN CONST MAIN_FORM_STATE  *MainFormState\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  CONST GOP_MODE  *GopMode;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  CONST GOP_MODE   *GopMode;\r
 \r
   //\r
   // There's nothing to do with the textual CurrentPreferredResolution field.\r
@@ -279,6 +291,7 @@ FormStateToPlatformConfig (
   if (MainFormState->NextPreferredResolution >= mNumGopModes) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   GopMode = mGopModes + MainFormState->NextPreferredResolution;\r
 \r
   ZeroMem (&PlatformConfig, sizeof PlatformConfig);\r
@@ -289,7 +302,6 @@ FormStateToPlatformConfig (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   This function is called by the HII machinery when it wants the driver to\r
   interpret and persist the form state.\r
@@ -315,14 +327,18 @@ RouteConfig (
   IN CONST  EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
   IN CONST  EFI_STRING                      Configuration,\r
   OUT       EFI_STRING                      *Progress\r
-)\r
+  )\r
 {\r
-  MAIN_FORM_STATE MainFormState;\r
-  UINTN           BlockSize;\r
-  EFI_STATUS      Status;\r
+  MAIN_FORM_STATE  MainFormState;\r
+  UINTN            BlockSize;\r
+  EFI_STATUS       Status;\r
 \r
-  DEBUG ((DEBUG_VERBOSE, "%a: Configuration=\"%s\"\n", __FUNCTION__,\r
-    Configuration));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Configuration=\"%s\"\n",\r
+    __FUNCTION__,\r
+    Configuration\r
+    ));\r
 \r
   //\r
   // the "read" step in RMW\r
@@ -340,12 +356,21 @@ RouteConfig (
   // general we must pre-load the form state from the platform config.)\r
   //\r
   BlockSize = sizeof MainFormState;\r
-  Status = gHiiConfigRouting->ConfigToBlock (gHiiConfigRouting, Configuration,\r
-                                (VOID *) &MainFormState, &BlockSize, Progress);\r
+  Status    = gHiiConfigRouting->ConfigToBlock (\r
+                                   gHiiConfigRouting,\r
+                                   Configuration,\r
+                                   (VOID *)&MainFormState,\r
+                                   &BlockSize,\r
+                                   Progress\r
+                                   );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((DEBUG_ERROR, "%a: ConfigToBlock(): %r, Progress=\"%s\"\n",\r
-      __FUNCTION__, Status,\r
-      (Status == EFI_BUFFER_TOO_SMALL) ? NULL : *Progress));\r
+    DEBUG ((\r
+      DEBUG_ERROR,\r
+      "%a: ConfigToBlock(): %r, Progress=\"%s\"\n",\r
+      __FUNCTION__,\r
+      Status,\r
+      (Status == EFI_BUFFER_TOO_SMALL) ? NULL : *Progress\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -356,46 +381,51 @@ RouteConfig (
   if (EFI_ERROR (Status)) {\r
     *Progress = Configuration;\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-\r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 Callback (\r
-  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN     EFI_BROWSER_ACTION                     Action,\r
-  IN     EFI_QUESTION_ID                        QuestionId,\r
-  IN     UINT8                                  Type,\r
-  IN OUT EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT    EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN     CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN     EFI_BROWSER_ACTION                    Action,\r
+  IN     EFI_QUESTION_ID                       QuestionId,\r
+  IN     UINT8                                 Type,\r
+  IN OUT EFI_IFR_TYPE_VALUE                    *Value,\r
+  OUT    EFI_BROWSER_ACTION_REQUEST            *ActionRequest\r
   )\r
 {\r
-  DEBUG ((DEBUG_VERBOSE, "%a: Action=0x%Lx QuestionId=%d Type=%d\n",\r
-    __FUNCTION__, (UINT64) Action, QuestionId, Type));\r
+  DEBUG ((\r
+    DEBUG_VERBOSE,\r
+    "%a: Action=0x%Lx QuestionId=%d Type=%d\n",\r
+    __FUNCTION__,\r
+    (UINT64)Action,\r
+    QuestionId,\r
+    Type\r
+    ));\r
 \r
   if (Action != EFI_BROWSER_ACTION_CHANGED) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   switch (QuestionId) {\r
-  case QUESTION_SAVE_EXIT:\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-    break;\r
+    case QUESTION_SAVE_EXIT:\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+      break;\r
 \r
-  case QUESTION_DISCARD_EXIT:\r
-    *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-    break;\r
+    case QUESTION_DISCARD_EXIT:\r
+      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Query and save all resolutions supported by the GOP.\r
 \r
@@ -417,17 +447,18 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 QueryGopModes (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop,\r
-  OUT UINTN                        *NumGopModes,\r
-  OUT GOP_MODE                     **GopModes\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop,\r
+  OUT UINTN                         *NumGopModes,\r
+  OUT GOP_MODE                      **GopModes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     ModeNumber;\r
+  EFI_STATUS  Status;\r
+  UINT32      ModeNumber;\r
 \r
   if (Gop->Mode->MaxMode == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
+\r
   *NumGopModes = Gop->Mode->MaxMode;\r
 \r
   *GopModes = AllocatePool (Gop->Mode->MaxMode * sizeof **GopModes);\r
@@ -436,8 +467,8 @@ QueryGopModes (
   }\r
 \r
   for (ModeNumber = 0; ModeNumber < Gop->Mode->MaxMode; ++ModeNumber) {\r
-    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info;\r
-    UINTN                                SizeOfInfo;\r
+    EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
+    UINTN                                 SizeOfInfo;\r
 \r
     Status = Gop->QueryMode (Gop, ModeNumber, &SizeOfInfo, &Info);\r
     if (EFI_ERROR (Status)) {\r
@@ -457,7 +488,6 @@ FreeGopModes:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Create a set of "one-of-many" (ie. "drop down list") option IFR opcodes,\r
   based on available GOP resolutions, to be placed under a "one-of-many" (ie.\r
@@ -492,9 +522,9 @@ CreateResolutionOptions (
   IN  GOP_MODE        *GopModes\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  VOID       *OutputBuffer;\r
-  UINTN      ModeNumber;\r
+  EFI_STATUS  Status;\r
+  VOID        *OutputBuffer;\r
+  UINTN       ModeNumber;\r
 \r
   OutputBuffer = HiiAllocateOpCodeHandle ();\r
   if (OutputBuffer == NULL) {\r
@@ -502,20 +532,35 @@ CreateResolutionOptions (
   }\r
 \r
   for (ModeNumber = 0; ModeNumber < NumGopModes; ++ModeNumber) {\r
-    CHAR16        Desc[MAXSIZE_RES_CUR];\r
-    EFI_STRING_ID NewString;\r
-    VOID          *OpCode;\r
-\r
-    UnicodeSPrintAsciiFormat (Desc, sizeof Desc, "%Ldx%Ld",\r
-      (INT64) GopModes[ModeNumber].X, (INT64) GopModes[ModeNumber].Y);\r
-    NewString = HiiSetString (PackageList, 0 /* new string */, Desc,\r
-                  NULL /* for all languages */);\r
+    CHAR16         Desc[MAXSIZE_RES_CUR];\r
+    EFI_STRING_ID  NewString;\r
+    VOID           *OpCode;\r
+\r
+    UnicodeSPrintAsciiFormat (\r
+      Desc,\r
+      sizeof Desc,\r
+      "%Ldx%Ld",\r
+      (INT64)GopModes[ModeNumber].X,\r
+      (INT64)GopModes[ModeNumber].Y\r
+      );\r
+    NewString = HiiSetString (\r
+                  PackageList,\r
+                  0 /* new string */,\r
+                  Desc,\r
+                  NULL /* for all languages */\r
+                  );\r
     if (NewString == 0) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeOutputBuffer;\r
     }\r
-    OpCode = HiiCreateOneOfOptionOpCode (OutputBuffer, NewString,\r
-               0 /* Flags */, EFI_IFR_NUMERIC_SIZE_4, ModeNumber);\r
+\r
+    OpCode = HiiCreateOneOfOptionOpCode (\r
+               OutputBuffer,\r
+               NewString,\r
+               0 /* Flags */,\r
+               EFI_IFR_NUMERIC_SIZE_4,\r
+               ModeNumber\r
+               );\r
     if (OpCode == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto FreeOutputBuffer;\r
@@ -531,7 +576,6 @@ FreeOutputBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Populate the form identified by the (PackageList, FormSetGuid, FormId)\r
   triplet.\r
@@ -554,11 +598,11 @@ PopulateForm (
   IN  GOP_MODE        *GopModes\r
   )\r
 {\r
-  EFI_STATUS         Status;\r
-  VOID               *OpCodeBuffer;\r
-  VOID               *OpCode;\r
-  EFI_IFR_GUID_LABEL *Anchor;\r
-  VOID               *OpCodeBuffer2;\r
+  EFI_STATUS          Status;\r
+  VOID                *OpCodeBuffer;\r
+  VOID                *OpCode;\r
+  EFI_IFR_GUID_LABEL  *Anchor;\r
+  VOID                *OpCodeBuffer2;\r
 \r
   OpCodeBuffer2 = NULL;\r
 \r
@@ -574,12 +618,17 @@ PopulateForm (
   // 2. Create a label opcode (which is a Tiano extension) inside the buffer.\r
   // The label's number must match the "anchor" label in the form.\r
   //\r
-  OpCode = HiiCreateGuidOpCode (OpCodeBuffer, &gEfiIfrTianoGuid,\r
-             NULL /* optional copy origin */, sizeof *Anchor);\r
+  OpCode = HiiCreateGuidOpCode (\r
+             OpCodeBuffer,\r
+             &gEfiIfrTianoGuid,\r
+             NULL /* optional copy origin */,\r
+             sizeof *Anchor\r
+             );\r
   if (OpCode == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto FreeOpCodeBuffer;\r
   }\r
+\r
   Anchor               = OpCode;\r
   Anchor->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   Anchor->Number       = LABEL_RES_NEXT;\r
@@ -590,8 +639,12 @@ PopulateForm (
   //\r
   // 3.1. Get a list of resolutions.\r
   //\r
-  Status = CreateResolutionOptions (PackageList, &OpCodeBuffer2,\r
-             NumGopModes, GopModes);\r
+  Status = CreateResolutionOptions (\r
+             PackageList,\r
+             &OpCodeBuffer2,\r
+             NumGopModes,\r
+             GopModes\r
+             );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeOpCodeBuffer;\r
   }\r
@@ -605,8 +658,10 @@ PopulateForm (
              QUESTION_RES_NEXT,                   // ID of question,\r
              FORMSTATEID_MAIN_FORM,               // identifies form state\r
                                                   //   storage,\r
-             (UINT16) OFFSET_OF (MAIN_FORM_STATE, // value of question stored\r
-                        NextPreferredResolution), //   at this offset,\r
+             (UINT16)OFFSET_OF (\r
+                       MAIN_FORM_STATE,           // value of question stored\r
+                       NextPreferredResolution\r
+                       ),                         //   at this offset,\r
              STRING_TOKEN (STR_RES_NEXT),         // Prompt,\r
              STRING_TOKEN (STR_RES_NEXT_HELP),    // Help,\r
              0,                                   // QuestionFlags,\r
@@ -624,7 +679,10 @@ PopulateForm (
   //\r
   // 4. Update the form with the opcode buffer.\r
   //\r
-  Status = HiiUpdateForm (PackageList, FormSetGuid, FormId,\r
+  Status = HiiUpdateForm (\r
+             PackageList,\r
+             FormSetGuid,\r
+             FormId,\r
              OpCodeBuffer, // buffer with head anchor, and new contents to be\r
                            // inserted at it\r
              NULL          // buffer with tail anchor, for deleting old\r
@@ -640,7 +698,6 @@ FreeOpCodeBuffer:
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Load and execute the platform configuration.\r
 \r
@@ -654,15 +711,19 @@ ExecutePlatformConfig (
   VOID\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
-  PLATFORM_CONFIG PlatformConfig;\r
-  UINT64          OptionalElements;\r
-  RETURN_STATUS   PcdStatus;\r
+  EFI_STATUS       Status;\r
+  PLATFORM_CONFIG  PlatformConfig;\r
+  UINT64           OptionalElements;\r
+  RETURN_STATUS    PcdStatus;\r
 \r
   Status = PlatformConfigLoad (&PlatformConfig, &OptionalElements);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG (((Status == EFI_NOT_FOUND) ? DEBUG_VERBOSE : DEBUG_ERROR,\r
-      "%a: failed to load platform config: %r\n", __FUNCTION__, Status));\r
+    DEBUG ((\r
+      (Status == EFI_NOT_FOUND) ? DEBUG_VERBOSE : DEBUG_ERROR,\r
+      "%a: failed to load platform config: %r\n",\r
+      __FUNCTION__,\r
+      Status\r
+      ));\r
     return Status;\r
   }\r
 \r
@@ -670,19 +731,22 @@ ExecutePlatformConfig (
     //\r
     // Pass the preferred resolution to GraphicsConsoleDxe via dynamic PCDs.\r
     //\r
-    PcdStatus = PcdSet32S (PcdVideoHorizontalResolution,\r
-      PlatformConfig.HorizontalResolution);\r
+    PcdStatus = PcdSet32S (\r
+                  PcdVideoHorizontalResolution,\r
+                  PlatformConfig.HorizontalResolution\r
+                  );\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
-    PcdStatus = PcdSet32S (PcdVideoVerticalResolution,\r
-      PlatformConfig.VerticalResolution);\r
+    PcdStatus = PcdSet32S (\r
+                  PcdVideoVerticalResolution,\r
+                  PlatformConfig.VerticalResolution\r
+                  );\r
     ASSERT_RETURN_ERROR (PcdStatus);\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Notification callback for GOP interface installation.\r
 \r
@@ -695,24 +759,27 @@ STATIC
 VOID\r
 EFIAPI\r
 GopInstalled (\r
-  IN EFI_EVENT Event,\r
-  IN VOID      *Context\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS                   Status;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop;\r
+  EFI_STATUS                    Status;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop;\r
 \r
   ASSERT (Event == mGopEvent);\r
 \r
   //\r
   // Check further GOPs.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     mNumGopModes = 0;\r
-    mGopModes = NULL;\r
+    mGopModes    = NULL;\r
 \r
-    Status = gBS->LocateProtocol (&gEfiGraphicsOutputProtocolGuid, mGopTracker,\r
-                    (VOID **) &Gop);\r
+    Status = gBS->LocateProtocol (\r
+                    &gEfiGraphicsOutputProtocolGuid,\r
+                    mGopTracker,\r
+                    (VOID **)&Gop\r
+                    );\r
     if (EFI_ERROR (Status)) {\r
       return;\r
     }\r
@@ -722,8 +789,13 @@ GopInstalled (
       continue;\r
     }\r
 \r
-    Status = PopulateForm (mInstalledPackages, &gOvmfPlatformConfigGuid,\r
-               FORMID_MAIN_FORM, mNumGopModes, mGopModes);\r
+    Status = PopulateForm (\r
+               mInstalledPackages,\r
+               &gOvmfPlatformConfigGuid,\r
+               FORMID_MAIN_FORM,\r
+               mNumGopModes,\r
+               mGopModes\r
+               );\r
     if (EFI_ERROR (Status)) {\r
       FreePool (mGopModes);\r
       continue;\r
@@ -738,11 +810,10 @@ GopInstalled (
   //\r
   Status = gBS->CloseEvent (mGopEvent);\r
   ASSERT_EFI_ERROR (Status);\r
-  mGopEvent = NULL;\r
+  mGopEvent   = NULL;\r
   mGopTracker = NULL;\r
 }\r
 \r
-\r
 /**\r
   Entry point for this driver.\r
 \r
@@ -761,7 +832,7 @@ PlatformInit (
   IN  EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   ExecutePlatformConfig ();\r
 \r
@@ -772,10 +843,14 @@ PlatformInit (
   //\r
   // Declare ourselves suitable for HII communication.\r
   //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle,\r
-                  &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-                  &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-                  NULL);\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &ImageHandle,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  &mPkgDevicePath,\r
+                  &gEfiHiiConfigAccessProtocolGuid,\r
+                  &mConfigAccess,\r
+                  NULL\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -795,14 +870,22 @@ PlatformInit (
     goto UninstallProtocols;\r
   }\r
 \r
-  Status = gBS->CreateEvent (EVT_NOTIFY_SIGNAL, TPL_CALLBACK, &GopInstalled,\r
-                  NULL /* Context */, &mGopEvent);\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  &GopInstalled,\r
+                  NULL /* Context */,\r
+                  &mGopEvent\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto RemovePackages;\r
   }\r
 \r
-  Status = gBS->RegisterProtocolNotify (&gEfiGraphicsOutputProtocolGuid,\r
-                  mGopEvent, &mGopTracker);\r
+  Status = gBS->RegisterProtocolNotify (\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  mGopEvent,\r
+                  &mGopTracker\r
+                  );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseGopEvent;\r
   }\r
@@ -822,10 +905,14 @@ RemovePackages:
   HiiRemovePackages (mInstalledPackages);\r
 \r
 UninstallProtocols:\r
-  gBS->UninstallMultipleProtocolInterfaces (ImageHandle,\r
-         &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-         &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-         NULL);\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+         ImageHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         &mPkgDevicePath,\r
+         &gEfiHiiConfigAccessProtocolGuid,\r
+         &mConfigAccess,\r
+         NULL\r
+         );\r
   return Status;\r
 }\r
 \r
@@ -861,9 +948,13 @@ PlatformUnload (
   // Release resources allocated by the entry point.\r
   //\r
   HiiRemovePackages (mInstalledPackages);\r
-  gBS->UninstallMultipleProtocolInterfaces (ImageHandle,\r
-         &gEfiDevicePathProtocolGuid,      &mPkgDevicePath,\r
-         &gEfiHiiConfigAccessProtocolGuid, &mConfigAccess,\r
-         NULL);\r
+  gBS->UninstallMultipleProtocolInterfaces (\r
+         ImageHandle,\r
+         &gEfiDevicePathProtocolGuid,\r
+         &mPkgDevicePath,\r
+         &gEfiHiiConfigAccessProtocolGuid,\r
+         &mConfigAccess,\r
+         NULL\r
+         );\r
   return EFI_SUCCESS;\r
 }\r