Change UINAME to CName of GUID/PPI/Protocol in all Msa file and change tool to suppo...

[mirror_edk2.git] / MdePkg / Library / PeiHobLib / HobLib.c

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index 380a735b99f11c5f84217edaf3983ba9dd5150ec..ce9f79f82c1f4ec38cd37d85855f65ccabc4bc36 100644 (file)
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -33,7 +33,7 @@ GetHobList (
   EFI_STATUS            Status;\r
   VOID                  *HobList;\r
 \r
   EFI_STATUS            Status;\r
   VOID                  *HobList;\r
 \r

-  Status = PeiCoreGetHobList (&HobList);\r
+  Status = PeiServicesGetHobList (&HobList);\r

   ASSERT_EFI_ERROR (Status);\r
   ASSERT (HobList != NULL);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (HobList != NULL);\r
 \r


@@ -187,7 +187,7 @@ InternalPeiCreateHob (
   EFI_STATUS        Status;\r
   VOID              *Hob;\r
 \r
   EFI_STATUS        Status;\r
   VOID              *Hob;\r
 \r

-  Status = PeiCoreCreateHob (Type, Length, &Hob);\r
+  Status = PeiServicesCreateHob (Type, Length, &Hob);\r

   //\r
   // Assume the process of HOB building is always successful.\r
   //\r
   //\r
   // Assume the process of HOB building is always successful.\r
   //\r


@@ -275,7 +275,7 @@ BuildResourceDescriptorHob (
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
   If Guid is NULL, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r

-  If DataLength > (0x10000 - sizeof (EFI_HOB_TYPE_GUID)), then ASSERT().\r
+  If DataLength >= (0x10000 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r

 \r
   @param  Guid          The GUID to tag the customized HOB.\r
   @param  DataLength    The size of the data payload for the GUID HOB.\r
 \r
   @param  Guid          The GUID to tag the customized HOB.\r
   @param  DataLength    The size of the data payload for the GUID HOB.\r


@@ -313,7 +313,7 @@ BuildGuidHob (
   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r
   If Guid is NULL, then ASSERT().\r
   If Data is NULL and DataLength > 0, then ASSERT().\r
   If there is no additional space for HOB creation, then ASSERT().\r

-  If DataLength > (0x10000 - sizeof (EFI_HOB_TYPE_GUID)), then ASSERT().\r
+  If DataLength >= (0x10000 - sizeof (EFI_HOB_GUID_TYPE)), then ASSERT().\r

 \r
   @param  Guid          The GUID to tag the customized HOB.\r
   @param  Data          The data to be copied into the data field of the GUID HOB.\r
 \r
   @param  Guid          The GUID to tag the customized HOB.\r
   @param  Data          The data to be copied into the data field of the GUID HOB.\r


@@ -332,6 +332,8 @@ BuildGuidDataHob (
 {\r
   VOID  *HobData;\r
 \r
 {\r
   VOID  *HobData;\r
 \r

+  ASSERT (Data != NULL || DataLength == 0);\r
+\r

   HobData = BuildGuidHob (Guid, DataLength);\r
 \r
   return CopyMem (HobData, Data, DataLength);\r
   HobData = BuildGuidHob (Guid, DataLength);\r
 \r
   return CopyMem (HobData, Data, DataLength);\r