Changeset 33071 in vbox for trunk/src

Timestamp:

Oct 12, 2010 2:52:41 PM (14 years ago)

Author:

vboxsync

Message:

EFI: manual patch file editing is a bad idea

File:

• trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/edk2.patch-mem_acpi (modified) (10 diffs)

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/edk2.patch-mem_acpi

@@ -1 @@
-Index: MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+Index: ../edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
 ===================================================================
---- MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c  (revision 9332)
-+++ MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c  (working copy)
+--- ../edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c  (revision 9332)
++++ ../edk2/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c  (working copy)
 @@ -10,7 +10,7 @@
    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -12 +12 @@
  #include <PiDxe.h>
  
-@@ -153,7 +153,134 @@
+@@ -153,7 +153,137 @@
    Buffer[ChecksumOffset] = CalculateCheckSum8(Buffer, Size);
  }
@@ -94 +94 @@
 +        { SIGNATURE_32('D', 'S', 'D', 'T'), 0, "DSDT"},
 +        // SSDT
-+        { SIGNATURE_32('S', 'S', 'D', 'T'), 0, "SSDT"},
++        { SIGNATURE_32('S', 'S', 'D', 'T'), FLAG_OPTIONAL, "SSDT"},
 +        // HPET
 +        { SIGNATURE_32('H', 'P', 'E', 'T'), FLAG_OPTIONAL, "HPET"},
@@ -118 +118 @@
 +             ASSERT(Ptr != NULL);
 +        DEBUG ((EFI_D_ERROR, "%a: %p\n", TableInfo[Index].Name, Ptr));
-+        if (Ptr) Tables[Table++] = Ptr;
++        if (Ptr)
++           Tables[Table++] = Ptr;
 +    }
 +
@@ -149 +150 @@
    Entrypoint of Acpi Platform driver.
  
-@@ -174,14 +301,21 @@
+@@ -174,14 +304,21 @@
  {
    EFI_STATUS                     Status;
@@ -171 +172 @@
    CurrentTable = NULL;
    TableHandle  = 0;
-@@ -194,6 +327,18 @@
+@@ -194,6 +331,18 @@
      return EFI_ABORTED;
    }
@@ -190 +191 @@
    // Locate the firmware volume protocol
    //
-@@ -205,7 +350,6 @@
+@@ -205,7 +354,6 @@
    // Read tables from the storage file.
    //
@@ -198 +199 @@
                        FwVol,
                        (EFI_GUID*)FixedPcdGetPtr (PcdAcpiTableStorageFile),
-@@ -215,6 +359,7 @@
+@@ -215,6 +363,7 @@
                        &Size,
                        &FvStatus
@@ -206 +207 @@
        //
        // Add the table
-@@ -222,6 +367,7 @@
+@@ -222,6 +371,7 @@
        TableHandle = 0;
  
@@ -214 +215 @@
  
        //
-@@ -252,4 +398,3 @@
+@@ -252,4 +402,3 @@
  
    return EFI_SUCCESS;