]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / Console / GraphicsOutputDxe / GraphicsOutput.c
index 84172c1464a804351beb6ef879235694b487e795..2259d6d4eae2ddaa152880be39a9ab78880c9a15 100644 (file)
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/\r
 \r
 #include "GraphicsOutput.h"\r
-CONST ACPI_ADR_DEVICE_PATH mGraphicsOutputAdrNode = {\r
+CONST ACPI_ADR_DEVICE_PATH  mGraphicsOutputAdrNode = {\r
   {\r
     ACPI_DEVICE_PATH,\r
     ACPI_ADR_DP,\r
@@ -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)\r
 };\r
 \r
-EFI_PEI_GRAPHICS_DEVICE_INFO_HOB mDefaultGraphicsDeviceInfo = {\r
+EFI_PEI_GRAPHICS_DEVICE_INFO_HOB  mDefaultGraphicsDeviceInfo = {\r
   MAX_UINT16, MAX_UINT16, MAX_UINT16, MAX_UINT16, MAX_UINT8, MAX_UINT8\r
 };\r
 \r
@@ -25,7 +25,7 @@ EFI_PEI_GRAPHICS_DEVICE_INFO_HOB mDefaultGraphicsDeviceInfo = {
 // The driver should only start on one graphics controller.\r
 // So a global flag is used to remember that the driver is already started.\r
 //\r
-BOOLEAN mDriverStarted = FALSE;\r
+BOOLEAN  mDriverStarted = FALSE;\r
 \r
 /**\r
   Returns information for an available graphics mode that the graphics device\r
@@ -50,7 +50,7 @@ GraphicsOutputQueryMode (
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info\r
   )\r
 {\r
-  if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
+  if ((This == NULL) || (Info == NULL) || (SizeOfInfo == NULL) || (ModeNumber >= This->Mode->MaxMode)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -74,13 +74,13 @@ GraphicsOutputQueryMode (
 EFI_STATUS\r
 EFIAPI\r
 GraphicsOutputSetMode (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL *This,\r
-  IN  UINT32                       ModeNumber\r
-)\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL  *This,\r
+  IN  UINT32                        ModeNumber\r
+  )\r
 {\r
-  RETURN_STATUS                    Status;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL    Black;\r
-  GRAPHICS_OUTPUT_PRIVATE_DATA     *Private;\r
+  RETURN_STATUS                  Status;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  Black;\r
+  GRAPHICS_OUTPUT_PRIVATE_DATA   *Private;\r
 \r
   if (ModeNumber >= This->Mode->MaxMode) {\r
     return EFI_UNSUPPORTED;\r
@@ -88,17 +88,19 @@ GraphicsOutputSetMode (
 \r
   Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This);\r
 \r
-  Black.Blue = 0;\r
-  Black.Green = 0;\r
-  Black.Red = 0;\r
+  Black.Blue     = 0;\r
+  Black.Green    = 0;\r
+  Black.Red      = 0;\r
   Black.Reserved = 0;\r
 \r
   Status = FrameBufferBlt (\r
              Private->FrameBufferBltLibConfigure,\r
              &Black,\r
              EfiBltVideoFill,\r
-             0, 0,\r
-             0, 0,\r
+             0,\r
+             0,\r
+             0,\r
+             0,\r
              This->Mode->Info->HorizontalResolution,\r
              This->Mode->Info->VerticalResolution,\r
              0\r
@@ -132,21 +134,21 @@ GraphicsOutputSetMode (
 EFI_STATUS\r
 EFIAPI\r
 GraphicsOutputBlt (\r
-  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL      *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer  OPTIONAL,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,\r
-  IN  UINTN                             SourceX,\r
-  IN  UINTN                             SourceY,\r
-  IN  UINTN                             DestinationX,\r
-  IN  UINTN                             DestinationY,\r
-  IN  UINTN                             Width,\r
-  IN  UINTN                             Height,\r
-  IN  UINTN                             Delta         OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
+  IN  UINTN                              SourceX,\r
+  IN  UINTN                              SourceY,\r
+  IN  UINTN                              DestinationX,\r
+  IN  UINTN                              DestinationY,\r
+  IN  UINTN                              Width,\r
+  IN  UINTN                              Height,\r
+  IN  UINTN                              Delta         OPTIONAL\r
   )\r
 {\r
-  RETURN_STATUS                         Status;\r
-  EFI_TPL                               Tpl;\r
-  GRAPHICS_OUTPUT_PRIVATE_DATA          *Private;\r
+  RETURN_STATUS                 Status;\r
+  EFI_TPL                       Tpl;\r
+  GRAPHICS_OUTPUT_PRIVATE_DATA  *Private;\r
 \r
   Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This);\r
   //\r
@@ -154,13 +156,17 @@ GraphicsOutputBlt (
   // We would not want a timer based event (Cursor, ...) to come in while we are\r
   // doing this operation.\r
   //\r
-  Tpl = gBS->RaiseTPL (TPL_NOTIFY);\r
+  Tpl    = gBS->RaiseTPL (TPL_NOTIFY);\r
   Status = FrameBufferBlt (\r
              Private->FrameBufferBltLibConfigure,\r
              BltBuffer,\r
              BltOperation,\r
-             SourceX, SourceY,\r
-             DestinationX, DestinationY, Width, Height,\r
+             SourceX,\r
+             SourceY,\r
+             DestinationX,\r
+             DestinationY,\r
+             Width,\r
+             Height,\r
              Delta\r
              );\r
   gBS->RestoreTPL (Tpl);\r
@@ -168,7 +174,7 @@ GraphicsOutputBlt (
   return RETURN_ERROR (Status) ? EFI_INVALID_PARAMETER : EFI_SUCCESS;\r
 }\r
 \r
-CONST GRAPHICS_OUTPUT_PRIVATE_DATA mGraphicsOutputInstanceTemplate = {\r
+CONST GRAPHICS_OUTPUT_PRIVATE_DATA  mGraphicsOutputInstanceTemplate = {\r
   GRAPHICS_OUTPUT_PRIVATE_DATA_SIGNATURE,          // Signature\r
   NULL,                                            // GraphicsOutputHandle\r
   {\r
@@ -206,14 +212,14 @@ CONST GRAPHICS_OUTPUT_PRIVATE_DATA mGraphicsOutputInstanceTemplate = {
 EFI_STATUS\r
 EFIAPI\r
 GraphicsOutputDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;\r
+  EFI_STATUS                Status;\r
+  EFI_PCI_IO_PROTOCOL       *PciIo;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
 \r
   //\r
   // Since there is only one GraphicsInfo HOB, the driver only manages one video device.\r
@@ -228,7 +234,7 @@ GraphicsOutputDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -236,9 +242,11 @@ GraphicsOutputDriverBindingSupported (
   if (Status == EFI_ALREADY_STARTED) {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   gBS->CloseProtocol (\r
          Controller,\r
          &gEfiPciIoProtocolGuid,\r
@@ -252,7 +260,7 @@ GraphicsOutputDriverBindingSupported (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &DevicePath,\r
+                  (VOID **)&DevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -260,9 +268,11 @@ GraphicsOutputDriverBindingSupported (
   if (Status == EFI_ALREADY_STARTED) {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   gBS->CloseProtocol (\r
          Controller,\r
          &gEfiDevicePathProtocolGuid,\r
@@ -272,7 +282,8 @@ GraphicsOutputDriverBindingSupported (
 \r
   if ((RemainingDevicePath == NULL) ||\r
       IsDevicePathEnd (RemainingDevicePath) ||\r
-      CompareMem (RemainingDevicePath, &mGraphicsOutputAdrNode, sizeof (mGraphicsOutputAdrNode)) == 0) {\r
+      (CompareMem (RemainingDevicePath, &mGraphicsOutputAdrNode, sizeof (mGraphicsOutputAdrNode)) == 0))\r
+  {\r
     return EFI_SUCCESS;\r
   } else {\r
     return EFI_INVALID_PARAMETER;\r
@@ -293,29 +304,29 @@ GraphicsOutputDriverBindingSupported (
 EFI_STATUS\r
 EFIAPI\r
 GraphicsOutputDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *RemainingDevicePath\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  RETURN_STATUS                     ReturnStatus;\r
-  GRAPHICS_OUTPUT_PRIVATE_DATA      *Private;\r
-  EFI_PCI_IO_PROTOCOL               *PciIo;\r
-  EFI_DEVICE_PATH                   *PciDevicePath;\r
-  PCI_TYPE00                        Pci;\r
-  UINT8                             Index;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Resources;\r
-  VOID                              *HobStart;\r
-  EFI_PEI_GRAPHICS_INFO_HOB         *GraphicsInfo;\r
-  EFI_PEI_GRAPHICS_DEVICE_INFO_HOB  *DeviceInfo;\r
-  EFI_PHYSICAL_ADDRESS              FrameBufferBase;\r
+  EFI_STATUS                         Status;\r
+  RETURN_STATUS                      ReturnStatus;\r
+  GRAPHICS_OUTPUT_PRIVATE_DATA       *Private;\r
+  EFI_PCI_IO_PROTOCOL                *PciIo;\r
+  EFI_DEVICE_PATH                    *PciDevicePath;\r
+  PCI_TYPE00                         Pci;\r
+  UINT8                              Index;\r
+  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR  *Resources;\r
+  VOID                               *HobStart;\r
+  EFI_PEI_GRAPHICS_INFO_HOB          *GraphicsInfo;\r
+  EFI_PEI_GRAPHICS_DEVICE_INFO_HOB   *DeviceInfo;\r
+  EFI_PHYSICAL_ADDRESS               FrameBufferBase;\r
 \r
   FrameBufferBase = 0;\r
 \r
   HobStart = GetFirstGuidHob (&gEfiGraphicsInfoHobGuid);\r
   ASSERT ((HobStart != NULL) && (GET_GUID_HOB_DATA_SIZE (HobStart) == sizeof (EFI_PEI_GRAPHICS_INFO_HOB)));\r
-  GraphicsInfo = (EFI_PEI_GRAPHICS_INFO_HOB *) (GET_GUID_HOB_DATA (HobStart));\r
+  GraphicsInfo = (EFI_PEI_GRAPHICS_INFO_HOB *)(GET_GUID_HOB_DATA (HobStart));\r
 \r
   HobStart = GetFirstGuidHob (&gEfiGraphicsDeviceInfoHobGuid);\r
   if ((HobStart == NULL) || (GET_GUID_HOB_DATA_SIZE (HobStart) < sizeof (*DeviceInfo))) {\r
@@ -325,15 +336,21 @@ GraphicsOutputDriverBindingStart (
     DeviceInfo = &mDefaultGraphicsDeviceInfo;\r
     DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB doesn't exist!\n", gEfiCallerBaseName));\r
   } else {\r
-    DeviceInfo = (EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *) (GET_GUID_HOB_DATA (HobStart));\r
-    DEBUG ((DEBUG_INFO, "[%a]: GraphicsDeviceInfo HOB:\n"\r
-            "  VendorId = %04x, DeviceId = %04x,\n"\r
-            "  RevisionId = %02x, BarIndex = %x,\n"\r
-            "  SubsystemVendorId = %04x, SubsystemId = %04x\n",\r
-            gEfiCallerBaseName,\r
-            DeviceInfo->VendorId, DeviceInfo->DeviceId,\r
-            DeviceInfo->RevisionId, DeviceInfo->BarIndex,\r
-            DeviceInfo->SubsystemVendorId, DeviceInfo->SubsystemId));\r
+    DeviceInfo = (EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *)(GET_GUID_HOB_DATA (HobStart));\r
+    DEBUG ((\r
+      DEBUG_INFO,\r
+      "[%a]: GraphicsDeviceInfo HOB:\n"\r
+      "  VendorId = %04x, DeviceId = %04x,\n"\r
+      "  RevisionId = %02x, BarIndex = %x,\n"\r
+      "  SubsystemVendorId = %04x, SubsystemId = %04x\n",\r
+      gEfiCallerBaseName,\r
+      DeviceInfo->VendorId,\r
+      DeviceInfo->DeviceId,\r
+      DeviceInfo->RevisionId,\r
+      DeviceInfo->BarIndex,\r
+      DeviceInfo->SubsystemVendorId,\r
+      DeviceInfo->SubsystemId\r
+      ));\r
   }\r
 \r
   //\r
@@ -342,7 +359,7 @@ GraphicsOutputDriverBindingStart (
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiPciIoProtocolGuid,\r
-                  (VOID **) &PciIo,\r
+                  (VOID **)&PciIo,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -350,12 +367,13 @@ GraphicsOutputDriverBindingStart (
   if (Status == EFI_ALREADY_STARTED) {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = gBS->OpenProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  (VOID **) &PciDevicePath,\r
+                  (VOID **)&PciDevicePath,\r
                   This->DriverBindingHandle,\r
                   Controller,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -363,6 +381,7 @@ GraphicsOutputDriverBindingStart (
   if (Status == EFI_ALREADY_STARTED) {\r
     Status = EFI_SUCCESS;\r
   }\r
+\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -371,13 +390,14 @@ GraphicsOutputDriverBindingStart (
   Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, 0, sizeof (Pci), &Pci);\r
   if (!EFI_ERROR (Status)) {\r
     if (!IS_PCI_DISPLAY (&Pci) || (\r
-        ((DeviceInfo->VendorId != MAX_UINT16) && (DeviceInfo->VendorId != Pci.Hdr.VendorId)) ||\r
-        ((DeviceInfo->DeviceId != MAX_UINT16) && (DeviceInfo->DeviceId != Pci.Hdr.DeviceId)) ||\r
-        ((DeviceInfo->RevisionId != MAX_UINT8) && (DeviceInfo->RevisionId != Pci.Hdr.RevisionID)) ||\r
-        ((DeviceInfo->SubsystemVendorId != MAX_UINT16) && (DeviceInfo->SubsystemVendorId != Pci.Device.SubsystemVendorID)) ||\r
-        ((DeviceInfo->SubsystemId != MAX_UINT16) && (DeviceInfo->SubsystemId != Pci.Device.SubsystemID))\r
+                                   ((DeviceInfo->VendorId != MAX_UINT16) && (DeviceInfo->VendorId != Pci.Hdr.VendorId)) ||\r
+                                   ((DeviceInfo->DeviceId != MAX_UINT16) && (DeviceInfo->DeviceId != Pci.Hdr.DeviceId)) ||\r
+                                   ((DeviceInfo->RevisionId != MAX_UINT8) && (DeviceInfo->RevisionId != Pci.Hdr.RevisionID)) ||\r
+                                   ((DeviceInfo->SubsystemVendorId != MAX_UINT16) && (DeviceInfo->SubsystemVendorId != Pci.Device.SubsystemVendorID)) ||\r
+                                   ((DeviceInfo->SubsystemId != MAX_UINT16) && (DeviceInfo->SubsystemId != Pci.Device.SubsystemID))\r
+                                   )\r
         )\r
-        ) {\r
+    {\r
       //\r
       // It's not a video device, or device infomation doesn't match.\r
       //\r
@@ -393,21 +413,30 @@ GraphicsOutputDriverBindingStart (
         if ((DeviceInfo->BarIndex != MAX_UINT8) && (DeviceInfo->BarIndex != Index)) {\r
           continue;\r
         }\r
-        Status = PciIo->GetBarAttributes (PciIo, Index, NULL, (VOID**) &Resources);\r
+\r
+        Status = PciIo->GetBarAttributes (PciIo, Index, NULL, (VOID **)&Resources);\r
         if (!EFI_ERROR (Status)) {\r
-          DEBUG ((DEBUG_INFO, "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",\r
-                  gEfiCallerBaseName, Index, Resources->AddrRangeMin, Resources->AddrLen));\r
+          DEBUG ((\r
+            DEBUG_INFO,\r
+            "[%a]: BAR[%d]: Base = %lx, Length = %lx\n",\r
+            gEfiCallerBaseName,\r
+            Index,\r
+            Resources->AddrRangeMin,\r
+            Resources->AddrLen\r
+            ));\r
           if ((Resources->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) &&\r
-            (Resources->Len == (UINT16) (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3)) &&\r
+              (Resources->Len == (UINT16)(sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - 3)) &&\r
               (Resources->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) &&\r
               (Resources->AddrLen >= GraphicsInfo->FrameBufferSize)\r
-              ) {\r
+              )\r
+          {\r
             FrameBufferBase = Resources->AddrRangeMin;\r
             DEBUG ((DEBUG_INFO, "[%a]: ... matched!\n", gEfiCallerBaseName));\r
             break;\r
           }\r
         }\r
       }\r
+\r
       if (Index == MAX_PCI_BAR) {\r
         Status = EFI_UNSUPPORTED;\r
       }\r
@@ -430,7 +459,7 @@ GraphicsOutputDriverBindingStart (
 \r
   Private->GraphicsOutputMode.FrameBufferBase = FrameBufferBase;\r
   Private->GraphicsOutputMode.FrameBufferSize = GraphicsInfo->FrameBufferSize;\r
-  Private->GraphicsOutputMode.Info = &GraphicsInfo->GraphicsMode;\r
+  Private->GraphicsOutputMode.Info            = &GraphicsInfo->GraphicsMode;\r
 \r
   //\r
   // Fix up Mode pointer in GraphicsOutput\r
@@ -463,7 +492,7 @@ GraphicsOutputDriverBindingStart (
   // Create the FrameBufferBltLib configuration.\r
   //\r
   ReturnStatus = FrameBufferBltConfigure (\r
-                   (VOID *) (UINTN) Private->GraphicsOutput.Mode->FrameBufferBase,\r
+                   (VOID *)(UINTN)Private->GraphicsOutput.Mode->FrameBufferBase,\r
                    Private->GraphicsOutput.Mode->Info,\r
                    Private->FrameBufferBltLibConfigure,\r
                    &Private->FrameBufferBltLibConfigureSize\r
@@ -472,19 +501,20 @@ GraphicsOutputDriverBindingStart (
     Private->FrameBufferBltLibConfigure = AllocatePool (Private->FrameBufferBltLibConfigureSize);\r
     if (Private->FrameBufferBltLibConfigure != NULL) {\r
       ReturnStatus = FrameBufferBltConfigure (\r
-                       (VOID *) (UINTN) Private->GraphicsOutput.Mode->FrameBufferBase,\r
+                       (VOID *)(UINTN)Private->GraphicsOutput.Mode->FrameBufferBase,\r
                        Private->GraphicsOutput.Mode->Info,\r
                        Private->FrameBufferBltLibConfigure,\r
                        &Private->FrameBufferBltLibConfigureSize\r
                        );\r
     }\r
   }\r
+\r
   if (RETURN_ERROR (ReturnStatus)) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto RestorePciAttributes;\r
   }\r
 \r
-  Private->DevicePath = AppendDevicePathNode (PciDevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &mGraphicsOutputAdrNode);\r
+  Private->DevicePath = AppendDevicePathNode (PciDevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&mGraphicsOutputAdrNode);\r
   if (Private->DevicePath == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto RestorePciAttributes;\r
@@ -492,8 +522,10 @@ GraphicsOutputDriverBindingStart (
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Private->GraphicsOutputHandle,\r
-                  &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,\r
-                  &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  &Private->GraphicsOutput,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  Private->DevicePath,\r
                   NULL\r
                   );\r
 \r
@@ -501,7 +533,7 @@ GraphicsOutputDriverBindingStart (
     Status = gBS->OpenProtocol (\r
                     Controller,\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &Private->PciIo,\r
+                    (VOID **)&Private->PciIo,\r
                     This->DriverBindingHandle,\r
                     Private->GraphicsOutputHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
@@ -511,8 +543,10 @@ GraphicsOutputDriverBindingStart (
     } else {\r
       gBS->UninstallMultipleProtocolInterfaces (\r
              Private->GraphicsOutputHandle,\r
-             &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,\r
-             &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
+             &gEfiGraphicsOutputProtocolGuid,\r
+             &Private->GraphicsOutput,\r
+             &gEfiDevicePathProtocolGuid,\r
+             Private->DevicePath,\r
              NULL\r
              );\r
     }\r
@@ -537,9 +571,11 @@ FreeMemory:
       if (Private->DevicePath != NULL) {\r
         FreePool (Private->DevicePath);\r
       }\r
+\r
       if (Private->FrameBufferBltLibConfigure != NULL) {\r
         FreePool (Private->FrameBufferBltLibConfigure);\r
       }\r
+\r
       FreePool (Private);\r
     }\r
   }\r
@@ -566,6 +602,7 @@ CloseProtocols:
            Controller\r
            );\r
   }\r
+\r
   return Status;\r
 }\r
 \r
@@ -584,18 +621,17 @@ CloseProtocols:
 EFI_STATUS\r
 EFIAPI\r
 GraphicsOutputDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL    *This,\r
-  IN EFI_HANDLE                     Controller,\r
-  IN UINTN                          NumberOfChildren,\r
-  IN EFI_HANDLE                     *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   Controller,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL      *Gop;\r
-  GRAPHICS_OUTPUT_PRIVATE_DATA      *Private;\r
+  EFI_STATUS                    Status;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *Gop;\r
+  GRAPHICS_OUTPUT_PRIVATE_DATA  *Private;\r
 \r
   if (NumberOfChildren == 0) {\r
-\r
     //\r
     // Close the PCI I/O Protocol\r
     //\r
@@ -621,7 +657,7 @@ GraphicsOutputDriverBindingStop (
   Status = gBS->OpenProtocol (\r
                   ChildHandleBuffer[0],\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID **) &Gop,\r
+                  (VOID **)&Gop,\r
                   This->DriverBindingHandle,\r
                   ChildHandleBuffer[0],\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -644,8 +680,10 @@ GraphicsOutputDriverBindingStop (
   //\r
   Status = gBS->UninstallMultipleProtocolInterfaces (\r
                   Private->GraphicsOutputHandle,\r
-                  &gEfiGraphicsOutputProtocolGuid, &Private->GraphicsOutput,\r
-                  &gEfiDevicePathProtocolGuid, Private->DevicePath,\r
+                  &gEfiGraphicsOutputProtocolGuid,\r
+                  &Private->GraphicsOutput,\r
+                  &gEfiDevicePathProtocolGuid,\r
+                  Private->DevicePath,\r
                   NULL\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
@@ -667,17 +705,18 @@ GraphicsOutputDriverBindingStop (
     Status = gBS->OpenProtocol (\r
                     Controller,\r
                     &gEfiPciIoProtocolGuid,\r
-                    (VOID **) &Private->PciIo,\r
+                    (VOID **)&Private->PciIo,\r
                     This->DriverBindingHandle,\r
                     Private->GraphicsOutputHandle,\r
                     EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
   }\r
+\r
   return Status;\r
 }\r
 \r
-EFI_DRIVER_BINDING_PROTOCOL mGraphicsOutputDriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL  mGraphicsOutputDriverBinding = {\r
   GraphicsOutputDriverBindingSupported,\r
   GraphicsOutputDriverBindingStart,\r
   GraphicsOutputDriverBindingStop,\r
@@ -702,12 +741,12 @@ EFI_DRIVER_BINDING_PROTOCOL mGraphicsOutputDriverBinding = {
 EFI_STATUS\r
 EFIAPI\r
 InitializeGraphicsOutput (\r
-  IN EFI_HANDLE                        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                  *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS                           Status;\r
-  VOID                                 *HobStart;\r
+  EFI_STATUS  Status;\r
+  VOID        *HobStart;\r
 \r
   HobStart = GetFirstGuidHob (&gEfiGraphicsInfoHobGuid);\r
 \r