fixed 2 k8 issues.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8204 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index edcb1aa9b5939d4a0174be41be0e0ca3473ff9ee..7cf4cc5db860f44e3cc9f368483a2eb51404a92d 100755 (executable)
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
@@ -1,7 +1,7 @@
 /** @file\r
   ACPI Table Protocol Implementation\r
 \r
-  Copyright (c) 2006, 2008, 2009, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2009, Intel Corporation<BR>\r
   All rights reserved. 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
@@ -613,45 +613,46 @@ AddTableToList (
           &Buffer64,\r
           sizeof (UINT64)\r
           );\r
-      }\r
-      //\r
-      // RSDP OEM information is updated to match the FADT OEM information\r
-      //\r
-      CopyMem (\r
-        &AcpiTableInstance->Rsdp3->OemId,\r
-        &AcpiTableInstance->Fadt3->Header.OemId,\r
-        6\r
-        );\r
 \r
-      //\r
-      // RSDT OEM information is updated to match FADT OEM information.\r
-      //\r
-      CopyMem (\r
-        &AcpiTableInstance->Rsdt3->OemId,\r
-        &AcpiTableInstance->Fadt3->Header.OemId,\r
-        6\r
-        );\r
-      CopyMem (\r
-        &AcpiTableInstance->Rsdt3->OemTableId,\r
-        &AcpiTableInstance->Fadt3->Header.OemTableId,\r
-        sizeof (UINT64)\r
-        );\r
-      AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
-\r
-      //\r
-      // XSDT OEM information is updated to match FADT OEM information.\r
-      //\r
-      CopyMem (\r
-        &AcpiTableInstance->Xsdt->OemId,\r
-        &AcpiTableInstance->Fadt3->Header.OemId,\r
-        6\r
-        );\r
-      CopyMem (\r
-        &AcpiTableInstance->Xsdt->OemTableId,\r
-        &AcpiTableInstance->Fadt3->Header.OemTableId,\r
-        sizeof (UINT64)\r
-        );\r
-      AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
+        //\r
+        // RSDP OEM information is updated to match the FADT OEM information\r
+        //\r
+        CopyMem (\r
+          &AcpiTableInstance->Rsdp3->OemId,\r
+          &AcpiTableInstance->Fadt3->Header.OemId,\r
+          6\r
+          );\r
+        \r
+        //\r
+        // RSDT OEM information is updated to match FADT OEM information.\r
+        //\r
+        CopyMem (\r
+          &AcpiTableInstance->Rsdt3->OemId,\r
+          &AcpiTableInstance->Fadt3->Header.OemId,\r
+          6\r
+          );\r
+        CopyMem (\r
+          &AcpiTableInstance->Rsdt3->OemTableId,\r
+          &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+          sizeof (UINT64)\r
+          );\r
+        AcpiTableInstance->Rsdt3->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
+        \r
+        //\r
+        // XSDT OEM information is updated to match FADT OEM information.\r
+        //\r
+        CopyMem (\r
+          &AcpiTableInstance->Xsdt->OemId,\r
+          &AcpiTableInstance->Fadt3->Header.OemId,\r
+          6\r
+          );\r
+        CopyMem (\r
+          &AcpiTableInstance->Xsdt->OemTableId,\r
+          &AcpiTableInstance->Fadt3->Header.OemTableId,\r
+          sizeof (UINT64)\r
+          );\r
+        AcpiTableInstance->Xsdt->OemRevision = AcpiTableInstance->Fadt3->Header.OemRevision;\r
+      }\r
     }    \r
     //\r
     // Checksum the table\r
@@ -1142,6 +1143,10 @@ DeleteTable (
   // Init locals\r
   //\r
   RemoveFromRsdt        = TRUE;\r
+  //\r
+  // Check for Table->Table\r
+  //\r
+  ASSERT (Table->Table != NULL);\r
   CurrentTableSignature = ((EFI_ACPI_COMMON_HEADER *) Table->Table)->Signature;\r
 \r
   //\r