Update Hob Instance to remove the unused InternalHobLib.h file.

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

diff --git a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
index 3e1504559a19d76cccfaf9e1b23fbe0c1d8d53ad..07b02fbff71cbcad6d092b98a739b645ac72da77 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
+++ b/MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -31,10 +31,8 @@
 #\r
 \r
 [Sources.common]\r
-  InternalHobLib.h\r
   HobLib.c\r
 \r
-\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
 \r
@@ -42,4 +40,5 @@
 [LibraryClasses]\r
   BaseMemoryLib\r
   DebugLib\r
+  DxeCoreEntryPoint\r
 \r

diff --git a/MdePkg/Library/DxeCoreHobLib/HobLib.c b/MdePkg/Library/DxeCoreHobLib/HobLib.c
index 1cce53e2d754f0f38eb45f60a4f42a1234bcad7e..b941bde19ccb1a9e12390604c87b63f53e755cb3 100644 (file)
--- a/MdePkg/Library/DxeCoreHobLib/HobLib.c
+++ b/MdePkg/Library/DxeCoreHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
-  HOB Library.\r
+  HOB Library implementation for DxeCore driver.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
   All rights reserved. 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
@@ -16,12 +16,10 @@
 \r
 #include <PiDxe.h>\r
 \r
-\r
 #include <Library/HobLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
-\r
-#include "InternalHobLib.h"\r
+#include <Library/DxeCoreEntryPoint.h>\r
 \r
 /**\r
   Returns the pointer to the HOB list.\r
@@ -187,6 +185,7 @@ GetBootModeHob (
   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
   HandOffHob = (EFI_HOB_HANDOFF_INFO_TABLE *) GetHobList ();\r
+  ASSERT (HandOffHob != NULL);\r
 \r
   return  HandOffHob->BootMode;\r
 }\r

diff --git a/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h b/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h
deleted file mode 100644 (file)
index 8d29da1..0000000
--- a/MdePkg/Library/DxeCoreHobLib/InternalHobLib.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/** @file\r
-  Internal include file of DXE Entry Point HOB Library.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef __DXE_ENTRY_POINT_HOB_LIB_H__\r
-#define __DXE_ENTRY_POINT_HOB_LIB_H__\r
-\r
-extern VOID *gHobList;\r
-\r
-#endif\r

diff --git a/MdePkg/Library/DxeHobLib/HobLib.c b/MdePkg/Library/DxeHobLib/HobLib.c
index 605d42f80c379354aa337e474ec9e0dc36f66902..e13469534a58044ed0b876f76af4a0fdebcfba18 100644 (file)
--- a/MdePkg/Library/DxeHobLib/HobLib.c
+++ b/MdePkg/Library/DxeHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
-  HOB Library.\r
+  HOB Library implemenation for Dxe Phase.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\r
   All rights reserved. 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
@@ -22,7 +22,6 @@
 #include <Library/UefiLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
-#include "HobLibInternal.h"\r
 \r
 STATIC VOID  *mHobList = NULL;\r
 \r
@@ -47,10 +46,11 @@ HobLibConstructor (
 {\r
   EFI_STATUS  Status;\r
 \r
-  Status = EfiGetSystemConfigurationTable (&gEfiHobListGuid, &mHobList);\r
+       Status = EfiGetSystemConfigurationTable (&gEfiHobListGuid, &mHobList);\r
   ASSERT_EFI_ERROR (Status);\r
   ASSERT (mHobList != NULL);\r
-  return Status;\r
+\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -201,7 +201,7 @@ GetFirstGuidHob (
   Get the Boot Mode from the HOB list.\r
 \r
   This function returns the system boot mode information from the \r
-  PHIT HOB in HOB list.\r
+  PHIT HOB in HOB list. If PHIT HOB is NULL, then ASSERT().\r
 \r
   @param  VOID\r
 \r
@@ -217,6 +217,7 @@ GetBootModeHob (
   EFI_HOB_HANDOFF_INFO_TABLE    *HandOffHob;\r
 \r
   HandOffHob = (EFI_HOB_HANDOFF_INFO_TABLE *) GetHobList ();\r
+  ASSERT (HandOffHob != NULL);\r
 \r
   return  HandOffHob->BootMode;\r
 }\r

diff --git a/MdePkg/Library/DxeHobLib/HobLibInternal.h b/MdePkg/Library/DxeHobLib/HobLibInternal.h
deleted file mode 100644 (file)
index 2a2fb8c..0000000
--- a/MdePkg/Library/DxeHobLib/HobLibInternal.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/** @file\r
-  Internal include file of DXE Entry Point HOB Library.\r
-\r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-#ifndef _DXE_HOB_LIB_INTERNAL_H__\r
-#define _DXE_HOB_LIB_INTERNAL_H__\r
-\r
-/**\r
-  \r
-  Initialize Hob list.\r
-   \r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-  @retval  EFI_SUCCESS One or more of the drivers returned a success code.\r
-  @retval  !EFI_SUCESS The return status from the last driver entry point in the list.\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-HobLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-;\r
-\r
-#endif\r

diff --git a/MdePkg/Library/PeiHobLib/HobLib.c b/MdePkg/Library/PeiHobLib/HobLib.c
index aa54e4fbe30c21ee73ddbffbc3d9b4c981132c9f..cbaf02896370e1a39d3379b5534d62fb6e222509 100644 (file)
--- a/MdePkg/Library/PeiHobLib/HobLib.c
+++ b/MdePkg/Library/PeiHobLib/HobLib.c
@@ -1,7 +1,7 @@
 /** @file\r
-  HOB Library.\r
+  Provide Hob Library functions for Pei phase.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2007 - 2008, Intel Corporation<BR>\r
   All rights reserved. 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
@@ -176,8 +176,8 @@ GetFirstGuidHob (
 /**\r
   Get the Boot Mode from the HOB list.\r
 \r
-  This function returns the system boot mode information from the \r
-  PHIT HOB in HOB list.\r
+  This function returns the system boot mode information \r
+  by PeiCore GetBootMode Service.\r
 \r
   @param  VOID\r
 \r
@@ -443,13 +443,8 @@ BuildFv2Hob (
 /**\r
   Builds a Capsule Volume HOB.\r
 \r
-  This function builds a Capsule Volume HOB.\r
-  It can only be invoked during PEI phase;\r
-  for DXE phase, it will ASSERT() since PEI HOB is read-only for DXE phase.\r
-  If there is no additional space for HOB creation, then ASSERT().\r
-\r
-  @param  BaseAddress   The base address of the Capsule Volume.\r
-  @param  Length        The size of the Capsule Volume in bytes.\r
+  This function is not supported, because Capsule Volume Hob is the platform\r
+  specific. It is not the common defintion in PI and UEFI spec.\r
 \r
 **/\r
 VOID\r