UefiPayloadPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the UefiPayloadPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

1 files changed, 145 insertions, 105 deletions

diff --git a/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c b/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c
index 887a10f75f..39ad03fe32 100644
--- a/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c
+++ b/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/

 

 #include "GraphicsOutput.h"

-CONST ACPI_ADR_DEVICE_PATH mGraphicsOutputAdrNode = {

+CONST ACPI_ADR_DEVICE_PATH  mGraphicsOutputAdrNode = {

   {

     ACPI_DEVICE_PATH,

     ACPI_ADR_DP,

@@ -17,7 +17,7 @@ CONST ACPI_ADR_DEVICE_PATH mGraphicsOutputAdrNode = {
   ACPI_DISPLAY_ADR (1, 0, 0, 1, 0, ACPI_ADR_DISPLAY_TYPE_VGA, 0, 0)

 };

 

-EFI_PEI_GRAPHICS_DEVICE_INFO_HOB mDefaultGraphicsDeviceInfo = {

+EFI_PEI_GRAPHICS_DEVICE_INFO_HOB  mDefaultGraphicsDeviceInfo = {

   MAX_UINT16, MAX_UINT16, MAX_UINT16, MAX_UINT16, MAX_UINT8, MAX_UINT8

 };

 

@@ -25,7 +25,7 @@ EFI_PEI_GRAPHICS_DEVICE_INFO_HOB mDefaultGraphicsDeviceInfo = {
 // The driver should only start on one graphics controller.

 // So a global flag is used to remember that the driver is already started.

 //

-BOOLEAN mDriverStarted = FALSE;

+BOOLEAN  mDriverStarted = FALSE;

 

 /**

   Returns information for an available graphics mode that the graphics device

@@ -50,7 +50,7 @@ GraphicsOutputQueryMode (
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info

   )

 {

-  if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {

+  if ((This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -74,13 +74,13 @@ GraphicsOutputQueryMode (
 EFI_STATUS

 EFIAPI

 GraphicsOutputSetMode (

-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,

-  IN  UINT32                       ModeNumber

-)

+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,

+  IN  UINT32                        ModeNumber

+  )

 {

-  RETURN_STATUS                    Status;

-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL    Black;

-  GRAPHICS_OUTPUT_PRIVATE_DATA     *Private;

+  RETURN_STATUS                  Status;

+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;

+  GRAPHICS_OUTPUT_PRIVATE_DATA   *Private;

 

   if (ModeNumber >= This->Mode->MaxMode) {

     return EFI_UNSUPPORTED;

@@ -88,17 +88,19 @@ GraphicsOutputSetMode (
 

   Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This);

 

-  Black.Blue = 0;

-  Black.Green = 0;

-  Black.Red = 0;

+  Black.Blue     = 0;

+  Black.Green    = 0;

+  Black.Red      = 0;

   Black.Reserved = 0;

 

   Status = FrameBufferBlt (

              Private->FrameBufferBltLibConfigure,

              &Black,

              EfiBltVideoFill,

-             0, 0,

-             0, 0,

+             0,

+             0,

+             0,

+             0,

              This->Mode->Info->HorizontalResolution,

              This->Mode->Info->VerticalResolution,

              0

@@ -132,21 +134,21 @@ GraphicsOutputSetMode (
 EFI_STATUS

 EFIAPI

 GraphicsOutputBlt (

-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL      *This,

-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer  OPTIONAL,

-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,

-  IN  UINTN                             SourceX,

-  IN  UINTN                             SourceY,

-  IN  UINTN                             DestinationX,

-  IN  UINTN                             DestinationY,

-  IN  UINTN                             Width,

-  IN  UINTN                             Height,

-  IN  UINTN                             Delta         OPTIONAL

+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,

+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,

+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,

+  IN  UINTN                              SourceX,

+  IN  UINTN                              SourceY,

+  IN  UINTN                              DestinationX,

+  IN  UINTN                              DestinationY,

+  IN  UINTN                              Width,

+  IN  UINTN                              Height,

+  IN  UINTN                              Delta         OPTIONAL

   )

 {

-  RETURN_STATUS                         Status;

-  EFI_TPL                               Tpl;

-  GRAPHICS_OUTPUT_PRIVATE_DATA          *Private;

+  RETURN_STATUS                 Status;

+  EFI_TPL                       Tpl;

+  GRAPHICS_OUTPUT_PRIVATE_DATA  *Private;

 

   Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This);

   //

@@ -154,13 +156,17 @@ GraphicsOutputBlt (
   // We would not want a timer based event (Cursor, ...) to come in while we are

   // doing this operation.

   //

-  Tpl = gBS->RaiseTPL (TPL_NOTIFY);

+  Tpl    = gBS->RaiseTPL (TPL_NOTIFY);

   Status = FrameBufferBlt (

              Private->FrameBufferBltLibConfigure,

              BltBuffer,

              BltOperation,

-             SourceX, SourceY,

-             DestinationX, DestinationY, Width, Height,

+             SourceX,

+             SourceY,

+             DestinationX,

+             DestinationY,

+             Width,

+             Height,

              Delta

              );

   gBS->RestoreTPL (Tpl);

@@ -168,7 +174,7 @@ GraphicsOutputBlt (
   return RETURN_ERROR (Status) ? EFI_INVALID_PARAMETER : EFI_SUCCESS;

 }

 

-CONST GRAPHICS_OUTPUT_PRIVATE_DATA mGraphicsOutputInstanceTemplate = {

+CONST GRAPHICS_OUTPUT_PRIVATE_DATA  mGraphicsOutputInstanceTemplate = {

   GRAPHICS_OUTPUT_PRIVATE_DATA_SIGNATURE,          // Signature

   NULL,                                            // GraphicsOutputHandle

   {

@@ -206,14 +212,14 @@ CONST GRAPHICS_OUTPUT_PRIVATE_DATA mGraphicsOutputInstanceTemplate = {
 EFI_STATUS

 EFIAPI

 GraphicsOutputDriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath

   )

 {

-  EFI_STATUS                        Status;

-  EFI_PCI_IO_PROTOCOL               *PciIo;

-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;

+  EFI_STATUS                Status;

+  EFI_PCI_IO_PROTOCOL       *PciIo;

+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;

 

   //

   // Since there is only one GraphicsInfo HOB, the driver only manages one video device.

@@ -228,7 +234,7 @@ GraphicsOutputDriverBindingSupported (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiPciIoProtocolGuid,

-                  (VOID **) &PciIo,

+                  (VOID **)&PciIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -236,9 +242,11 @@ GraphicsOutputDriverBindingSupported (
   if (Status == EFI_ALREADY_STARTED) {

     Status = EFI_SUCCESS;

   }

+

   if (EFI_ERROR (Status)) {

     return Status;

   }

+

   gBS->CloseProtocol (

          Controller,

          &gEfiPciIoProtocolGuid,

@@ -252,7 +260,7 @@ GraphicsOutputDriverBindingSupported (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiDevicePathProtocolGuid,

-                  (VOID **) &DevicePath,

+                  (VOID **)&DevicePath,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -260,9 +268,11 @@ GraphicsOutputDriverBindingSupported (
   if (Status == EFI_ALREADY_STARTED) {

     Status = EFI_SUCCESS;

   }

+

   if (EFI_ERROR (Status)) {

     return Status;

   }

+

   gBS->CloseProtocol (

          Controller,

          &gEfiDevicePathProtocolGuid,

@@ -272,7 +282,8 @@ GraphicsOutputDriverBindingSupported (
 

   if ((RemainingDevicePath == NULL) ||

       IsDevicePathEnd (RemainingDevicePath) ||

-      CompareMem (RemainingDevicePath, &mGraphicsOutputAdrNode, sizeof (mGraphicsOutputAdrNode)) == 0) {

+      (CompareMem (RemainingDevicePath, &mGraphicsOutputAdrNode, sizeof (mGraphicsOutputAdrNode)) == 0))

+  {

     return EFI_SUCCESS;

   } else {

     return EFI_INVALID_PARAMETER;

@@ -293,29 +304,29 @@ GraphicsOutputDriverBindingSupported (
 EFI_STATUS

 EFIAPI

 GraphicsOutputDriverBindingStart (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   Controller,

+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath

   )

 {

-  EFI_STATUS                        Status;

-  RETURN_STATUS                     ReturnStatus;

-  GRAPHICS_OUTPUT_PRIVATE_DATA      *Private;

-  EFI_PCI_IO_PROTOCOL               *PciIo;

-  EFI_DEVICE_PATH                   *PciDevicePath;

-  PCI_TYPE00                        Pci;

-  UINT8                             Index;

-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Resources;

-  VOID                              *HobStart;

-  EFI_PEI_GRAPHICS_INFO_HOB         *GraphicsInfo;

-  EFI_PEI_GRAPHICS_DEVICE_INFO_HOB  *DeviceInfo;

-  EFI_PHYSICAL_ADDRESS              FrameBufferBase;

+  EFI_STATUS                         Status;

+  RETURN_STATUS                      ReturnStatus;

+  GRAPHICS_OUTPUT_PRIVATE_DATA       *Private;

+  EFI_PCI_IO_PROTOCOL                *PciIo;

+  EFI_DEVICE_PATH                    *PciDevicePath;

+  PCI_TYPE00                         Pci;

+  UINT8                              Index;

+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Resources;

+  VOID                               *HobStart;

+  EFI_PEI_GRAPHICS_INFO_HOB          *GraphicsInfo;

+  EFI_PEI_GRAPHICS_DEVICE_INFO_HOB   *DeviceInfo;

+  EFI_PHYSICAL_ADDRESS               FrameBufferBase;

 

   FrameBufferBase = 0;

 

   HobStart = GetFirstGuidHob (&gEfiGraphicsInfoHobGuid);

   ASSERT ((HobStart != NULL) && (GET_GUID_HOB_DATA_SIZE (HobStart) == sizeof (EFI_PEI_GRAPHICS_INFO_HOB)));

-  GraphicsInfo = (EFI_PEI_GRAPHICS_INFO_HOB *) (GET_GUID_HOB_DATA (HobStart));

+  GraphicsInfo = (EFI_PEI_GRAPHICS_INFO_HOB *)(GET_GUID_HOB_DATA (HobStart));

 

   HobStart = GetFirstGuidHob (&gEfiGraphicsDeviceInfoHobGuid);

   if ((HobStart == NULL) || (GET_GUID_HOB_DATA_SIZE (HobStart) < sizeof (*DeviceInfo))) {

@@ -325,15 +336,21 @@ GraphicsOutputDriverBindingStart (
     DeviceInfo = &mDefaultGraphicsDeviceInfo;

     DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB doesn't exist!\n", gEfiCallerBaseName));

   } else {

-    DeviceInfo = (EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *) (GET_GUID_HOB_DATA (HobStart));

-    DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB:\n"

-            "  VendorId = %04x, DeviceId = %04x,\n"

-            "  RevisionId = %02x, BarIndex = %x,\n"

-            "  SubsystemVendorId = %04x, SubsystemId = %04x\n",

-            gEfiCallerBaseName,

-            DeviceInfo->VendorId, DeviceInfo->DeviceId,

-            DeviceInfo->RevisionId, DeviceInfo->BarIndex,

-            DeviceInfo->SubsystemVendorId, DeviceInfo->SubsystemId));

+    DeviceInfo = (EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *)(GET_GUID_HOB_DATA (HobStart));

+    DEBUG ((

+      DEBUG_INFO,

+      "[%a]: GraphicsDeviceInfo HOB:\n"

+      "  VendorId = %04x, DeviceId = %04x,\n"

+      "  RevisionId = %02x, BarIndex = %x,\n"

+      "  SubsystemVendorId = %04x, SubsystemId = %04x\n",

+      gEfiCallerBaseName,

+      DeviceInfo->VendorId,

+      DeviceInfo->DeviceId,

+      DeviceInfo->RevisionId,

+      DeviceInfo->BarIndex,

+      DeviceInfo->SubsystemVendorId,

+      DeviceInfo->SubsystemId

+      ));

   }

 

   //

@@ -342,7 +359,7 @@ GraphicsOutputDriverBindingStart (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiPciIoProtocolGuid,

-                  (VOID **) &PciIo,

+                  (VOID **)&PciIo,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -350,12 +367,13 @@ GraphicsOutputDriverBindingStart (
   if (Status == EFI_ALREADY_STARTED) {

     Status = EFI_SUCCESS;

   }

+

   ASSERT_EFI_ERROR (Status);

 

   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiDevicePathProtocolGuid,

-                  (VOID **) &PciDevicePath,

+                  (VOID **)&PciDevicePath,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -363,6 +381,7 @@ GraphicsOutputDriverBindingStart (
   if (Status == EFI_ALREADY_STARTED) {

     Status = EFI_SUCCESS;

   }

+

   ASSERT_EFI_ERROR (Status);

 

   //

@@ -371,13 +390,14 @@ GraphicsOutputDriverBindingStart (
   Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0, sizeof (Pci), &Pci);

   if (!EFI_ERROR (Status)) {

     if (!IS_PCI_DISPLAY (&Pci) || (

-        ((DeviceInfo->VendorId != MAX_UINT16) && (DeviceInfo->VendorId != Pci.Hdr.VendorId)) ||

-        ((DeviceInfo->DeviceId != MAX_UINT16) && (DeviceInfo->DeviceId != Pci.Hdr.DeviceId)) ||

-        ((DeviceInfo->RevisionId != MAX_UINT8) && (DeviceInfo->RevisionId != Pci.Hdr.RevisionID)) ||

-        ((DeviceInfo->SubsystemVendorId != MAX_UINT16) && (DeviceInfo->SubsystemVendorId != Pci.Device.SubsystemVendorID)) ||

-        ((DeviceInfo->SubsystemId != MAX_UINT16) && (DeviceInfo->SubsystemId != Pci.Device.SubsystemID))

+                                   ((DeviceInfo->VendorId != MAX_UINT16) && (DeviceInfo->VendorId != Pci.Hdr.VendorId)) ||

+                                   ((DeviceInfo->DeviceId != MAX_UINT16) && (DeviceInfo->DeviceId != Pci.Hdr.DeviceId)) ||

+                                   ((DeviceInfo->RevisionId != MAX_UINT8) && (DeviceInfo->RevisionId != Pci.Hdr.RevisionID)) ||

+                                   ((DeviceInfo->SubsystemVendorId != MAX_UINT16) && (DeviceInfo->SubsystemVendorId != Pci.Device.SubsystemVendorID)) ||

+                                   ((DeviceInfo->SubsystemId != MAX_UINT16) && (DeviceInfo->SubsystemId != Pci.Device.SubsystemID))

+                                   )

         )

-        ) {

+    {

       //

       // It's not a video device, or device infomation doesn't match.

       //

@@ -393,18 +413,27 @@ GraphicsOutputDriverBindingStart (
         if ((DeviceInfo->BarIndex != MAX_UINT8) && (DeviceInfo->BarIndex != Index)) {

           continue;

         }

-        Status = PciIo->GetBarAttributes (PciIo, Index, NULL, (VOID**) &Resources);

+

+        Status = PciIo->GetBarAttributes (PciIo, Index, NULL, (VOID **)&Resources);

         if (!EFI_ERROR (Status)) {

-          DEBUG ((DEBUG_INFO, "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",

-                  gEfiCallerBaseName, Index, Resources->AddrRangeMin, Resources->AddrLen));

+          DEBUG ((

+            DEBUG_INFO,

+            "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",

+            gEfiCallerBaseName,

+            Index,

+            Resources->AddrRangeMin,

+            Resources->AddrLen

+            ));

           if ((Resources->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) &&

-            (Resources->Len == (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3)) &&

+              (Resources->Len == (UINT16)(sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3)) &&

               (Resources->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) &&

               (Resources->AddrLen >= GraphicsInfo->FrameBufferSize)

-              ) {

+              )

+          {

             if (FrameBufferBase == 0) {

               FrameBufferBase = Resources->AddrRangeMin;

             }

+

             if (DeviceInfo->BarIndex == MAX_UINT8) {

               if (Resources->AddrRangeMin == GraphicsInfo->FrameBufferBase) {

                 FrameBufferBase = Resources->AddrRangeMin;

@@ -416,6 +445,7 @@ GraphicsOutputDriverBindingStart (
           }

         }

       }

+

       if (Index == MAX_PCI_BAR) {

         Status = EFI_UNSUPPORTED;

       } else {

@@ -440,7 +470,7 @@ GraphicsOutputDriverBindingStart (
 

   Private->GraphicsOutputMode.FrameBufferBase = FrameBufferBase;

   Private->GraphicsOutputMode.FrameBufferSize = GraphicsInfo->FrameBufferSize;

-  Private->GraphicsOutputMode.Info = &GraphicsInfo->GraphicsMode;

+  Private->GraphicsOutputMode.Info            = &GraphicsInfo->GraphicsMode;

 

   //

   // Fix up Mode pointer in GraphicsOutput

@@ -473,7 +503,7 @@ GraphicsOutputDriverBindingStart (
   // Create the FrameBufferBltLib configuration.

   //

   ReturnStatus = FrameBufferBltConfigure (

-                   (VOID *) (UINTN) Private->GraphicsOutput.Mode->FrameBufferBase,

+                   (VOID *)(UINTN)Private->GraphicsOutput.Mode->FrameBufferBase,

                    Private->GraphicsOutput.Mode->Info,

                    Private->FrameBufferBltLibConfigure,

                    &Private->FrameBufferBltLibConfigureSize

@@ -482,19 +512,20 @@ GraphicsOutputDriverBindingStart (
     Private->FrameBufferBltLibConfigure = AllocatePool (Private->FrameBufferBltLibConfigureSize);

     if (Private->FrameBufferBltLibConfigure != NULL) {

       ReturnStatus = FrameBufferBltConfigure (

-                       (VOID *) (UINTN) Private->GraphicsOutput.Mode->FrameBufferBase,

+                       (VOID *)(UINTN)Private->GraphicsOutput.Mode->FrameBufferBase,

                        Private->GraphicsOutput.Mode->Info,

                        Private->FrameBufferBltLibConfigure,

                        &Private->FrameBufferBltLibConfigureSize

                        );

     }

   }

+

   if (RETURN_ERROR (ReturnStatus)) {

     Status = EFI_OUT_OF_RESOURCES;

     goto RestorePciAttributes;

   }

 

-  Private->DevicePath = AppendDevicePathNode (PciDevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &mGraphicsOutputAdrNode);

+  Private->DevicePath = AppendDevicePathNode (PciDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&mGraphicsOutputAdrNode);

   if (Private->DevicePath == NULL) {

     Status = EFI_OUT_OF_RESOURCES;

     goto RestorePciAttributes;

@@ -502,8 +533,10 @@ GraphicsOutputDriverBindingStart (
 

   Status = gBS->InstallMultipleProtocolInterfaces (

                   &Private->GraphicsOutputHandle,

-                  &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,

-                  &gEfiDevicePathProtocolGuid, Private->DevicePath,

+                  &gEfiGraphicsOutputProtocolGuid,

+                  &Private->GraphicsOutput,

+                  &gEfiDevicePathProtocolGuid,

+                  Private->DevicePath,

                   NULL

                   );

 

@@ -511,7 +544,7 @@ GraphicsOutputDriverBindingStart (
     Status = gBS->OpenProtocol (

                     Controller,

                     &gEfiPciIoProtocolGuid,

-                    (VOID **) &Private->PciIo,

+                    (VOID **)&Private->PciIo,

                     This->DriverBindingHandle,

                     Private->GraphicsOutputHandle,

                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

@@ -521,8 +554,10 @@ GraphicsOutputDriverBindingStart (
     } else {

       gBS->UninstallMultipleProtocolInterfaces (

              Private->GraphicsOutputHandle,

-             &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,

-             &gEfiDevicePathProtocolGuid, Private->DevicePath,

+             &gEfiGraphicsOutputProtocolGuid,

+             &Private->GraphicsOutput,

+             &gEfiDevicePathProtocolGuid,

+             Private->DevicePath,

              NULL

              );

     }

@@ -547,9 +582,11 @@ FreeMemory:
       if (Private->DevicePath != NULL) {

         FreePool (Private->DevicePath);

       }

+

       if (Private->FrameBufferBltLibConfigure != NULL) {

         FreePool (Private->FrameBufferBltLibConfigure);

       }

+

       FreePool (Private);

     }

   }

@@ -576,6 +613,7 @@ CloseProtocols:
            Controller

            );

   }

+

   return Status;

 }

 

@@ -594,18 +632,17 @@ CloseProtocols:
 EFI_STATUS

 EFIAPI

 GraphicsOutputDriverBindingStop (

-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,

-  IN EFI_HANDLE                     Controller,

-  IN UINTN                          NumberOfChildren,

-  IN EFI_HANDLE                     *ChildHandleBuffer

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

+  IN EFI_HANDLE                   Controller,

+  IN UINTN                        NumberOfChildren,

+  IN EFI_HANDLE                   *ChildHandleBuffer

   )

 {

-  EFI_STATUS                        Status;

-  EFI_GRAPHICS_OUTPUT_PROTOCOL      *Gop;

-  GRAPHICS_OUTPUT_PRIVATE_DATA      *Private;

+  EFI_STATUS                    Status;

+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop;

+  GRAPHICS_OUTPUT_PRIVATE_DATA  *Private;

 

   if (NumberOfChildren == 0) {

-

     //

     // Close the PCI I/O Protocol

     //

@@ -631,7 +668,7 @@ GraphicsOutputDriverBindingStop (
   Status = gBS->OpenProtocol (

                   ChildHandleBuffer[0],

                   &gEfiGraphicsOutputProtocolGuid,

-                  (VOID **) &Gop,

+                  (VOID **)&Gop,

                   This->DriverBindingHandle,

                   ChildHandleBuffer[0],

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -654,8 +691,10 @@ GraphicsOutputDriverBindingStop (
   //

   Status = gBS->UninstallMultipleProtocolInterfaces (

                   Private->GraphicsOutputHandle,

-                  &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,

-                  &gEfiDevicePathProtocolGuid, Private->DevicePath,

+                  &gEfiGraphicsOutputProtocolGuid,

+                  &Private->GraphicsOutput,

+                  &gEfiDevicePathProtocolGuid,

+                  Private->DevicePath,

                   NULL

                   );

   if (!EFI_ERROR (Status)) {

@@ -677,17 +716,18 @@ GraphicsOutputDriverBindingStop (
     Status = gBS->OpenProtocol (

                     Controller,

                     &gEfiPciIoProtocolGuid,

-                    (VOID **) &Private->PciIo,

+                    (VOID **)&Private->PciIo,

                     This->DriverBindingHandle,

                     Private->GraphicsOutputHandle,

                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

                     );

     ASSERT_EFI_ERROR (Status);

   }

+

   return Status;

 }

 

-EFI_DRIVER_BINDING_PROTOCOL mGraphicsOutputDriverBinding = {

+EFI_DRIVER_BINDING_PROTOCOL  mGraphicsOutputDriverBinding = {

   GraphicsOutputDriverBindingSupported,

   GraphicsOutputDriverBindingStart,

   GraphicsOutputDriverBindingStop,

@@ -712,12 +752,12 @@ EFI_DRIVER_BINDING_PROTOCOL mGraphicsOutputDriverBinding = {
 EFI_STATUS

 EFIAPI

 InitializeGraphicsOutput (

-  IN EFI_HANDLE                        ImageHandle,

-  IN EFI_SYSTEM_TABLE                  *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                           Status;

-  VOID                                 *HobStart;

+  EFI_STATUS  Status;

+  VOID        *HobStart;

 

   HobStart = GetFirstGuidHob (&gEfiGraphicsInfoHobGuid);