Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/SmbiosDxe

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c (modified) (9 diffs)
• MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c

@@ -3 +3 @@
   SMBIOS table into system table.
   
-Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
@@ -50 +50 @@
   // MajorVersion
   //
-  (UINT8) (FixedPcdGet16 (PcdSmbiosVersion) >> 8),
+  0,
   //
   // MinorVersion
   //
-  (UINT8) (FixedPcdGet16 (PcdSmbiosVersion) & 0x00ff),
+  0,
   //
   // MaxStructureSize, TO BE FILLED
@@ -88 +88 @@
   0,
   //
-  // StructureTableLength, TO BE FILLED
+  // TableLength, TO BE FILLED
   //
   0,
   //
-  // StructureTableAddress, TO BE FILLED
+  // TableAddress, TO BE FILLED
   //
   0,
@@ -102 +102 @@
   // SmbiosBcdRevision
   //
-  0  
+  0
 };
 
@@ -981 +981 @@
     Status = gBS->AllocatePages (
                     AllocateMaxAddress,
-                    EfiReservedMemoryType,
+                    EfiRuntimeServicesData,
                     EFI_SIZE_TO_PAGES (EntryPointStructure->TableLength),
                     &PhysicalAddress
@@ -1079 +1079 @@
   mPrivateData.Smbios.Remove            = SmbiosRemove;
   mPrivateData.Smbios.GetNext           = SmbiosGetNext;
-  mPrivateData.Smbios.MajorVersion      = (UINT8) (FixedPcdGet16 (PcdSmbiosVersion) >> 8);
-  mPrivateData.Smbios.MinorVersion      = (UINT8) (FixedPcdGet16 (PcdSmbiosVersion) & 0x00ff);
+  mPrivateData.Smbios.MajorVersion      = (UINT8) (PcdGet16 (PcdSmbiosVersion) >> 8);
+  mPrivateData.Smbios.MinorVersion      = (UINT8) (PcdGet16 (PcdSmbiosVersion) & 0x00ff);
+  EntryPointStructureData.MajorVersion  = mPrivateData.Smbios.MajorVersion;
+  EntryPointStructureData.MinorVersion  = mPrivateData.Smbios.MinorVersion;
+  EntryPointStructureData.SmbiosBcdRevision = (UINT8) ((PcdGet16 (PcdSmbiosVersion) >> 4) & 0xf0) | (UINT8) (PcdGet16 (PcdSmbiosVersion) & 0x0f);
 
   InitializeListHead (&mPrivateData.DataListHead);
@@ -1093 +1096 @@
   Status = gBS->AllocatePages (
                   AllocateMaxAddress,
-                  EfiReservedMemoryType,
+                  EfiRuntimeServicesData,
                   EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),
                   &PhysicalAddress
@@ -1101 +1104 @@
     Status = gBS->AllocatePages (
                     AllocateAnyPages,
-                    EfiReservedMemoryType,
+                    EfiRuntimeServicesData,
                     EFI_SIZE_TO_PAGES (sizeof (SMBIOS_TABLE_ENTRY_POINT)),
                     &PhysicalAddress
@@ -1127 +1130 @@
   Status = gBS->AllocatePages (
                   AllocateMaxAddress,
-                  EfiReservedMemoryType,
+                  EfiRuntimeServicesData,
                   1,
                   &PhysicalAddress

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

@@ -1 +1 @@
 ## @file
-# Component description file for Smbios module.
+# This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.
 #
-# This driver initializes and installs the SMBIOS protocol.
-# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -18 +17 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmbiosDxe
+  MODULE_UNI_FILE                = SmbiosDxe.uni
   FILE_GUID                      = F9D88642-0737-49bc-81B5-6889CD57D9EA
   MODULE_TYPE                    = DXE_DRIVER
@@ -49 +49 @@
 
 [Protocols]
-  gEfiSmbiosProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED
+  gEfiSmbiosProtocolGuid                            ## PRODUCES
   
 [Guids]
-  gEfiEventReadyToBootGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiSmbiosTableGuid                         # PROTOCOL ALWAYS_CONSUMED
+  gEfiSmbiosTableGuid                               ## PRODUCES ## SystemTable
 
-[FixedPcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion
+[Pcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion   ## CONSUMES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SmbiosDxeExtra.uni