ShellPkg: Remove Status definition in function scope

[mirror_edk2.git] / OptionRomPkg / CirrusLogic5430Dxe / CirrusLogic5430.c

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
index 789b23358df603e60f8975ac31fc54494497889a..8b6dfac1fe361a62bc61e282035b553e7c6978c5 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.c
@@ -11,8 +11,8 @@
   documentation on UGA for details on how to write a UGA driver that is able\r
   to function both in the EFI pre-boot environment and from the OS runtime.\r
 \r
-  Copyright (c) 2006 - 2009, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\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
@@ -233,6 +233,7 @@ CirrusLogic5430ControllerDriverStart (
   BOOLEAN                         PciAttributesSaved;\r
   EFI_DEVICE_PATH_PROTOCOL        *ParentDevicePath;\r
   ACPI_ADR_DEVICE_PATH            AcpiDeviceNode;\r
+  UINT64                          Supports;\r
 \r
   PciAttributesSaved = FALSE;\r
   //\r
@@ -265,6 +266,25 @@ CirrusLogic5430ControllerDriverStart (
     goto Error;\r
   }\r
 \r
+  //\r
+  // Get supported PCI attributes\r
+  //\r
+  Status = Private->PciIo->Attributes (\r
+                             Private->PciIo,\r
+                             EfiPciIoAttributeOperationSupported,\r
+                             0,\r
+                             &Supports\r
+                             );\r
+  if (EFI_ERROR (Status)) {\r
+    goto Error;\r
+  }\r
+\r
+  Supports &= (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);\r
+  if (Supports == 0 || Supports == (EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) {\r
+    Status = EFI_UNSUPPORTED;\r
+    goto Error;\r
+  }  \r
+\r
   //\r
   // Save original PCI attributes\r
   //\r
@@ -281,11 +301,11 @@ CirrusLogic5430ControllerDriverStart (
   PciAttributesSaved = TRUE;\r
 \r
   Status = Private->PciIo->Attributes (\r
-                            Private->PciIo,\r
-                            EfiPciIoAttributeOperationEnable,\r
-                            EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | EFI_PCI_IO_ATTRIBUTE_VGA_IO,\r
-                            NULL\r
-                            );\r
+                             Private->PciIo,\r
+                             EfiPciIoAttributeOperationEnable,\r
+                             EFI_PCI_DEVICE_ENABLE | EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | Supports,\r
+                             NULL\r
+                             );\r
   if (EFI_ERROR (Status)) {\r
     goto Error;\r
   }\r