Add DXE_DRIVER to list of supported module types for BaseFileHandleLib.

[mirror_edk2.git] / OvmfPkg / Library / PlatformBdsLib / BdsPlatform.c

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 3728d40bb1db4966fb0324c70c95e591f4097050..e44c8253581f894b447f5e2505bdd01b29e8999f 100644 (file)
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -462,6 +462,14 @@ Returns:
       continue;\r
     }\r
 \r
+    Status = PciIo->Attributes (\r
+      PciIo,\r
+      EfiPciIoAttributeOperationEnable,\r
+      EFI_PCI_DEVICE_ENABLE,\r
+      NULL\r
+      );\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
     if (!DetectVgaOnly) {\r
       //\r
       // Here we decide whether it is LPC Bridge\r
@@ -472,17 +480,11 @@ Returns:
            (Pci.Hdr.DeviceId == 0x7000)\r
           )\r
          ) {\r
-        Status = PciIo->Attributes (\r
-          PciIo,\r
-          EfiPciIoAttributeOperationEnable,\r
-          EFI_PCI_DEVICE_ENABLE,\r
-          NULL\r
-          );\r
         //\r
         // Add IsaKeyboard to ConIn,\r
         // add IsaSerial to ConOut, ConIn, ErrOut\r
         //\r
-        DEBUG ((EFI_D_INFO, "Find the LPC Bridge device\n"));\r
+        DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n"));\r
         PrepareLpcBridgeDevicePath (HandleBuffer[Index]);\r
         continue;\r
       }\r
@@ -493,23 +495,12 @@ Returns:
         //\r
         // Add them to ConOut, ConIn, ErrOut.\r
         //\r
-        DEBUG ((EFI_D_INFO, "Find the 16550 SERIAL device\n"));\r
+        DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n"));\r
         PreparePciSerialDevicePath (HandleBuffer[Index]);\r
         continue;\r
       }\r
     }\r
 \r
-    if ((Pci.Hdr.VendorId == 0x8086) &&\r
-        (Pci.Hdr.DeviceId == 0x7010)\r
-       ) {\r
-      Status = PciIo->Attributes (\r
-        PciIo,\r
-        EfiPciIoAttributeOperationEnable,\r
-        EFI_PCI_DEVICE_ENABLE,\r
-        NULL\r
-        );\r
-     }\r
-\r
     //\r
     // Here we decide which VGA device to enable in PCI bus\r
     //\r
@@ -517,7 +508,7 @@ Returns:
       //\r
       // Add them to ConOut.\r
       //\r
-      DEBUG ((EFI_D_INFO, "Find the VGA device\n"));\r
+      DEBUG ((EFI_D_INFO, "Found PCI VGA device\n"));\r
       PreparePciVgaDevicePath (HandleBuffer[Index]);\r
       continue;\r
     }\r