Fix a K9 error.Result of GetVariable2() function that may return NULL will be derefer...

[mirror_edk2.git] / PcAtChipsetPkg / PciHostBridgeDxe / PciHostBridge.c

diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
index 6403a0723c9ff096e6af39312b906f1e3f5f9ae9..83fcdf4f1a7742fab38b38b9467864d6c8f319c2 100644 (file)
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.c
@@ -1,7 +1,7 @@
 /** @file\r
   Provides the basic interfaces to abstract a PCI Host Bridge Resource Allocation\r
 \r
-Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are\r
 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
@@ -22,25 +22,38 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 UINTN RootBridgeNumber[1] = { 1 };\r
 \r
-UINT64 RootBridgeAttribute[1][1] = { EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM };\r
+UINT64 RootBridgeAttribute[1][1] = { { EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM } };\r
 \r
 EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath[1][1] = {\r
   {\r
-    ACPI_DEVICE_PATH,\r
-    ACPI_DP,\r
-    (UINT8) (sizeof(ACPI_HID_DEVICE_PATH)),\r
-    (UINT8) ((sizeof(ACPI_HID_DEVICE_PATH)) >> 8),\r
-    EISA_PNP_ID(0x0A03),\r
-    0,\r
-    END_DEVICE_PATH_TYPE,\r
-    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    END_DEVICE_PATH_LENGTH,\r
-    0\r
+    {\r
+      {\r
+        {\r
+          ACPI_DEVICE_PATH,\r
+          ACPI_DP,\r
+          {\r
+            (UINT8) (sizeof(ACPI_HID_DEVICE_PATH)),\r
+            (UINT8) ((sizeof(ACPI_HID_DEVICE_PATH)) >> 8)\r
+          }\r
+        },\r
+        EISA_PNP_ID(0x0A03),\r
+        0\r
+      },\r
+  \r
+      {\r
+        END_DEVICE_PATH_TYPE,\r
+        END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+        {\r
+          END_DEVICE_PATH_LENGTH,\r
+          0\r
+        }\r
+      }\r
+    }\r
   }\r
 };\r
 \r
 PCI_ROOT_BRIDGE_RESOURCE_APPETURE  mResAppeture[1][1] = {\r
-  {0, 0xff, 0x80000000, 0xffffffff, 0, 0xffff}\r
+  {{0, 0xff, 0x80000000, 0xffffffff, 0, 0xffff}}\r
 };\r
 \r
 EFI_HANDLE mDriverImageHandle;\r
@@ -268,12 +281,14 @@ NotifyPhase(
     }  \r
     break;\r
 \r
+  case EfiPciHostBridgeEndEnumeration:\r
+    break;\r
+\r
   case EfiPciHostBridgeBeginBusAllocation:\r
     //\r
     // No specific action is required here, can perform any chipset specific programing\r
     //\r
     HostBridgeInstance->CanRestarted = FALSE;\r
-    return EFI_SUCCESS;\r
     break;\r
 \r
   case EfiPciHostBridgeEndBusAllocation:\r
@@ -281,7 +296,6 @@ NotifyPhase(
     // No specific action is required here, can perform any chipset specific programing\r
     //\r
     //HostBridgeInstance->CanRestarted = FALSE;\r
-    return EFI_SUCCESS;\r
     break;\r
 \r
   case EfiPciHostBridgeBeginResourceAllocation:\r
@@ -289,7 +303,6 @@ NotifyPhase(
     // No specific action is required here, can perform any chipset specific programing\r
     //\r
     //HostBridgeInstance->CanRestarted = FALSE;\r
-    return EFI_SUCCESS;\r
     break;\r
 \r
   case EfiPciHostBridgeAllocateResources:\r
@@ -459,7 +472,6 @@ NotifyPhase(
     HostBridgeInstance->ResourceSubmited = FALSE;\r
     HostBridgeInstance->CanRestarted     = TRUE;      \r
     return ReturnStatus;\r
-    break;\r
 \r
   case EfiPciHostBridgeEndResourceAllocation:\r
     HostBridgeInstance->CanRestarted = FALSE;\r
@@ -467,7 +479,7 @@ NotifyPhase(
 \r
   default:\r
     return EFI_INVALID_PARAMETER;\r
-  }; // end switch\r
+  }\r
   \r
   return EFI_SUCCESS;  \r
 }\r
@@ -1180,7 +1192,7 @@ PreprocessController (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Phase < EfiPciBeforeChildBusEnumeration || Phase > EfiMaxPciHostBridgeEnumerationPhase) {\r
+  if ((UINT32)Phase > EfiPciBeforeResourceCollection) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r