1. build.py's changes : include XXXEntryPointLib.h into the corresponding autogen...

2. code base changes : modify some interface definitions to follow the lastest Mde Library Spec.
3. PeiCore changes : remove the return value of PeiCore() which is meaningless as PeiCore will never reach the end of procedure.replace it with VOID.

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

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e4ef1a0b7ceefdd7f3a0ce7655c12cfe7470a840..c3102950c558bb457e5568a650b427da44d1a1df 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -230,7 +230,7 @@ typedef struct {
   @retval EFI_NOT_FOUND  Never reach\r
 \r
 **/\r
-EFI_STATUS\r
+VOID\r
 EFIAPI\r
 PeiCore (\r
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 8055659129e367b9aeb8ba6e6bea9a1464e1c931..32f875b688dbc946fbcea9557bc9dc96b830d3fe 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -86,7 +86,7 @@ STATIC EFI_PEI_SERVICES  gPs = {
   @retval EFI_NOT_FOUND  Never reach\r
 \r
 **/\r
-EFI_STATUS\r
+VOID\r
 EFIAPI\r
 PeiCore (\r
   IN CONST EFI_SEC_PEI_HAND_OFF        *SecCoreData,\r
@@ -156,7 +156,7 @@ PeiCore (
   //\r
   // Initialize libraries that the PeiCore is linked against\r
   //\r
-  ProcessLibraryConstructorList (NULL, &PrivateData.PS);\r
+  ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.PS);\r
 \r
   InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);\r
 \r
@@ -247,10 +247,11 @@ PeiCore (
                              &PrivateData.PS,\r
                              PrivateData.HobList\r
                              );\r
-\r
+  //\r
+  // Should never reach here.\r
+  //\r
   ASSERT_EFI_ERROR (Status);\r
-\r
-  return EFI_NOT_FOUND;\r
+  CpuDeadLoop();\r
 }\r
 \r
 \r

diff --git a/MdePkg/Include/Library/DxeCoreEntryPoint.h b/MdePkg/Include/Library/DxeCoreEntryPoint.h
index d735c821652960ae9951cac33a81a8e91fe8dafc..af4c24438376568b129f9741c5f19bd9dddfba5f 100644 (file)
--- a/MdePkg/Include/Library/DxeCoreEntryPoint.h
+++ b/MdePkg/Include/Library/DxeCoreEntryPoint.h
@@ -16,7 +16,7 @@
 #define __MODULE_ENTRY_POINT_H__\r
 \r
 ///\r
-/// Declare the cache of copy of HobList. \r
+/// Global variable that contains a pointer to the Hob List passed into the DXE Core entry point. \r
 /// \r
 extern VOID  *gHobList;\r
 \r

diff --git a/MdePkg/Include/Library/PeiCoreEntryPoint.h b/MdePkg/Include/Library/PeiCoreEntryPoint.h
index 84542e40862713de77e472a6e1ed8ab2acf56747..6d52445059a4e8707b7636247608d10c2922f277 100644 (file)
--- a/MdePkg/Include/Library/PeiCoreEntryPoint.h
+++ b/MdePkg/Include/Library/PeiCoreEntryPoint.h
@@ -88,8 +88,8 @@ EfiMain (
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r
-  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r
-  IN EFI_PEI_SERVICES     **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE        FileHandle,\r
+  IN CONST EFI_PEI_SERVICES     **PeiServices\r
   );\r
 \r
 \r

diff --git a/MdePkg/Include/Library/PeimEntryPoint.h b/MdePkg/Include/Library/PeimEntryPoint.h
index dedf32d67d7d21be7fd0fce7e45ff0cf18a3adad..81c78afbf98a6fdcdb3fd91427eb1f0905e9c26e 100644 (file)
--- a/MdePkg/Include/Library/PeimEntryPoint.h
+++ b/MdePkg/Include/Library/PeimEntryPoint.h
@@ -18,7 +18,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
 ///\r
-extern const UINT32                   _gPeimRevision;\r
+extern CONST UINT32       _gPeimRevision;\r
+\r
 \r
 /**\r
   Image entry point of Peim.\r
@@ -32,8 +33,8 @@ extern const UINT32                   _gPeimRevision;
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   );\r
 \r
 \r
@@ -49,8 +50,8 @@ _ModuleEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   );\r
 \r
 \r
@@ -64,8 +65,8 @@ EfiMain (
 VOID\r
 EFIAPI\r
 ProcessLibraryConstructorList (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   );\r
 \r
 \r
@@ -79,8 +80,8 @@ ProcessLibraryConstructorList (
 VOID\r
 EFIAPI\r
 ProcessLibraryDestructorList (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   );\r
 \r
 \r
@@ -96,8 +97,8 @@ ProcessLibraryDestructorList (
 EFI_STATUS\r
 EFIAPI\r
 ProcessModuleEntryPointList (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   );\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Library/UefiApplicationEntryPoint.h b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
index d9c25d92cb694047bd30308e2cc3af82c9bee417..9740b6f533a98d5be7f4c2b4db905f044ac10c38 100644 (file)
--- a/MdePkg/Include/Library/UefiApplicationEntryPoint.h
+++ b/MdePkg/Include/Library/UefiApplicationEntryPoint.h
@@ -18,7 +18,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
 ///\r
-extern const UINT32                   _gUefiDriverRevision;\r
+extern CONST UINT32        _gUefiDriverRevision;\r
+\r
 \r
 /**\r
   Enrty point to UEFI Application.\r

diff --git a/MdePkg/Include/Library/UefiDriverEntryPoint.h b/MdePkg/Include/Library/UefiDriverEntryPoint.h
index a6c4a74e961d67733b0a680c435d10c6cad551b9..b2808e7b631f18c9bf65f778d0cd785a0fc5597d 100644 (file)
--- a/MdePkg/Include/Library/UefiDriverEntryPoint.h
+++ b/MdePkg/Include/Library/UefiDriverEntryPoint.h
@@ -18,27 +18,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
 ///\r
-extern const UINT32                   _gUefiDriverRevision;\r
-\r
-///\r
-/// Declare the number of entry points in the image. \r
-///\r
-extern const UINT8                    _gDriverEntryPointCount;\r
+extern CONST UINT32                   _gUefiDriverRevision;\r
 \r
 ///\r
 /// Declare the number of unload handler in the image. \r
 ///\r
-extern const UINT8                    _gDriverUnloadImageCount;\r
-\r
-///\r
-/// Declare the arrary of Boot Sevice Exit Event callbacks . \r
-///\r
-extern const EFI_EVENT_NOTIFY         _gDriverExitBootServicesEvent[];\r
+extern CONST UINT8                    _gDriverUnloadImageCount;\r
 \r
-///\r
-/// Declare the arrary of Virtual Address Change Event callbacks . \r
-///\r
-extern const EFI_EVENT_NOTIFY         _gDriverSetVirtualAddressMapEvent[];\r
 \r
 /**\r
   Enrty point to DXE Driver.\r

diff --git a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
index 8a2c71a3dd4a08eb12275aa7a6a871762f6aa110..6ea991984e7f31e31025f7c3630c6d451910b5a1 100644 (file)
--- a/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
+++ b/MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
@@ -31,8 +31,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_STATUS\r
 EFIAPI\r
 _ModuleEntryPoint (\r
-  IN EFI_PEI_FILE_HANDLE       *FfsHeader,\r
-  IN EFI_PEI_SERVICES          **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE       FileHandle,\r
+  IN CONST EFI_PEI_SERVICES    **PeiServices\r
   )\r
 {\r
   if (_gPeimRevision != 0) {\r
@@ -45,12 +45,12 @@ _ModuleEntryPoint (
   //\r
   // Call constructor for all libraries\r
   //\r
-  ProcessLibraryConstructorList (FfsHeader, PeiServices);\r
+  ProcessLibraryConstructorList (FileHandle, PeiServices);\r
 \r
   //\r
   // Call the driver entry point\r
   //\r
-  return ProcessModuleEntryPointList (FfsHeader, PeiServices);\r
+  return ProcessModuleEntryPointList (FileHandle, PeiServices);\r
 }\r
 \r
 \r
@@ -66,9 +66,9 @@ _ModuleEntryPoint (
 EFI_STATUS\r
 EFIAPI\r
 EfiMain (\r
-  IN EFI_PEI_FILE_HANDLE  *FfsHeader,\r
-  IN EFI_PEI_SERVICES     **PeiServices\r
+  IN EFI_PEI_FILE_HANDLE      FileHandle,\r
+  IN CONST EFI_PEI_SERVICES   **PeiServices\r
   )\r
 {\r
-  return _ModuleEntryPoint (FfsHeader, PeiServices);\r
+  return _ModuleEntryPoint (FileHandle, PeiServices);\r
 }\r