Synchronized Macro definition of GET_GUID_HOB_DATA_SIZE, GET_GUID_HOB_DATA, END_OF_H...

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

diff --git a/MdePkg/Include/Library/HobLib.h b/MdePkg/Include/Library/HobLib.h
index 3746855bdbb54aefad39c26d885d4fb8582a8ed9..a92d37ad05b82e3309873f752e0004abb2f0a780 100644 (file)
--- a/MdePkg/Include/Library/HobLib.h
+++ b/MdePkg/Include/Library/HobLib.h
@@ -425,7 +425,9 @@ BuildMemoryAllocationHob (
   @return HobType\r
   \r
 **/\r
-#define GET_HOB_TYPE(Hob)     ((Hob).Header->HobType)\r
+//#define GET_HOB_TYPE(Hob)     ((Hob).Header->HobType)\r
+#define GET_HOB_TYPE(HobStart) \\r
+  ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType)\r
 \r
 /**\r
   Returns the length, in bytes, of a HOB.\r
@@ -438,7 +440,9 @@ BuildMemoryAllocationHob (
   @return HobLength\r
 \r
 **/\r
-#define GET_HOB_LENGTH(Hob)   ((Hob).Header->HobLength)\r
+//#define GET_HOB_LENGTH(Hob)   ((Hob).Header->HobLength)\r
+#define GET_HOB_LENGTH(HobStart) \\r
+  ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength)\r
 \r
 /**\r
   Returns a pointer to the next HOB in the HOB list.\r
@@ -451,7 +455,9 @@ BuildMemoryAllocationHob (
   @return A pointer to the next HOB in the HOB list.\r
 \r
 **/\r
-#define GET_NEXT_HOB(Hob)     ((Hob).Raw + GET_HOB_LENGTH (Hob))\r
+//#define GET_NEXT_HOB(Hob)     ((Hob).Raw + GET_HOB_LENGTH (Hob))\r
+#define GET_NEXT_HOB(HobStart) \\r
+  (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart))\r
 \r
 /**\r
   Determines if a HOB is the last HOB in the HOB list.\r
@@ -479,7 +485,9 @@ BuildMemoryAllocationHob (
   @return  A pointer to the data buffer in a HOB\r
   \r
 **/\r
-#define GET_GUID_HOB_DATA(GuidHob)      ((VOID *) (((UINT8 *) &((GuidHob)->Name)) + sizeof (EFI_GUID)))\r
+//#define GET_GUID_HOB_DATA(GuidHob)      ((VOID *) (((UINT8 *) &((GuidHob)->Name)) + sizeof (EFI_GUID)))\r
+#define GET_GUID_HOB_DATA(HobStart) \\r
+  (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE))\r
 \r
 /**\r
   Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION.\r
@@ -491,6 +499,8 @@ BuildMemoryAllocationHob (
 \r
   @return  The size of the data buffer\r
 **/\r
-#define GET_GUID_HOB_DATA_SIZE(GuidHob) (((GuidHob)->Header).HobLength - sizeof (EFI_HOB_GUID_TYPE))\r
+//#define GET_GUID_HOB_DATA_SIZE(GuidHob) (((GuidHob)->Header).HobLength - sizeof (EFI_HOB_GUID_TYPE))\r
+#define GET_GUID_HOB_DATA_SIZE(HobStart) \\r
+  (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE))\r
 \r
 #endif\r