EmbeddedPkg/Protocol/MmcHost: add new methods for I/O width and multiblock

[mirror_edk2.git] / MdeModulePkg / Universal / SmbiosDxe / SmbiosDxe.c

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 43d78a6a07951136087fa4c0416881ffe513ad13..ea762d59b9bdbefd35cdc54d96754d6555c92afd 100644 (file)
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -2,7 +2,7 @@
   This code produces the Smbios protocol. It also responsible for constructing \r
   SMBIOS table into system table.\r
   \r
-Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2009 - 2016, 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
@@ -665,7 +665,7 @@ SmbiosUpdateString (
       //\r
       TargetStrLen = AsciiStrLen(StrStart);\r
       if (InputStrLen == TargetStrLen) {\r
-        AsciiStrCpy(StrStart, String);\r
+        AsciiStrCpyS(StrStart, TargetStrLen + 1, String);\r
         //\r
         // Some UEFI drivers (such as network) need some information in SMBIOS table.\r
         // Here we create SMBIOS table and publish it in\r
@@ -1127,7 +1127,7 @@ SmbiosCreateTable (
   // Create End-Of-Table structure\r
   //\r
   GetMaxSmbiosHandle(SmbiosProtocol, &SmbiosHandle);\r
-  EndStructure.Header.Type = EFI_SMBIOS_TYPE_END_OF_TABLE;\r
+  EndStructure.Header.Type = SMBIOS_TYPE_END_OF_TABLE;\r
   EndStructure.Header.Length = (UINT8) sizeof (EFI_SMBIOS_TABLE_HEADER);\r
   EndStructure.Header.Handle = SmbiosHandle;\r
   EndStructure.Tailing[0] = 0;\r
@@ -1143,7 +1143,8 @@ SmbiosCreateTable (
     // If new SMBIOS table size exceeds the previous allocated page, \r
     // it is time to re-allocate memory (below 4GB).\r
     // \r
-    DEBUG ((EFI_D_ERROR, "SmbiosCreateTable() re-allocate SMBIOS 32-bit table\n"));\r
+    DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 32-bit table\n",\r
+      __FUNCTION__));\r
     if (EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r
@@ -1299,7 +1300,7 @@ SmbiosCreate64BitTable (
   // Create End-Of-Table structure\r
   //\r
   GetMaxSmbiosHandle(SmbiosProtocol, &SmbiosHandle);\r
-  EndStructure.Header.Type = EFI_SMBIOS_TYPE_END_OF_TABLE;\r
+  EndStructure.Header.Type = SMBIOS_TYPE_END_OF_TABLE;\r
   EndStructure.Header.Length = (UINT8) sizeof (EFI_SMBIOS_TABLE_HEADER);\r
   EndStructure.Header.Handle = SmbiosHandle;\r
   EndStructure.Tailing[0] = 0;\r
@@ -1311,7 +1312,8 @@ SmbiosCreate64BitTable (
     // If new SMBIOS table size exceeds the previous allocated page, \r
     // it is time to re-allocate memory at anywhere.\r
     //\r
-    DEBUG ((EFI_D_ERROR, "SmbiosCreate64BitTable() re-allocate SMBIOS 64-bit table\n"));\r
+    DEBUG ((EFI_D_INFO, "%a() re-allocate SMBIOS 64-bit table\n",\r
+      __FUNCTION__));\r
     if (Smbios30EntryPointStructure->TableAddress != 0) {\r
       //\r
       // Free the previous allocated page\r