tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. build.py's changes : include XXXEntryPointLib.h into the corresponding autogen.c files of various modules to avoid the inconsistence between the interface definition of library class and the implementation of autogen.c 

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
This commit is contained in:
eric_tian 2008-10-28 09:07:50 +00:00
parent a41a173f86
commit 0308e20dc6
8 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MdeModulePkg/Core/Pei/PeiMain.h
View File

@ -230,7 +230,7 @@ typedef struct {
@retval EFI_NOT_FOUND Never reach @retval EFI_NOT_FOUND Never reach
**/ **/
EFI_STATUS VOID
EFIAPI EFIAPI
PeiCore ( PeiCore (
IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData,

11
MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
View File

@ -86,7 +86,7 @@ STATIC EFI_PEI_SERVICES gPs = {
@retval EFI_NOT_FOUND Never reach @retval EFI_NOT_FOUND Never reach
**/ **/
EFI_STATUS VOID
EFIAPI EFIAPI
PeiCore ( PeiCore (
IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData,
@ -156,7 +156,7 @@ PeiCore (
// //
// Initialize libraries that the PeiCore is linked against // Initialize libraries that the PeiCore is linked against
// //
ProcessLibraryConstructorList (NULL, &PrivateData.PS); ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.PS);
InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData); InitializeMemoryServices (&PrivateData, SecCoreData, OldCoreData);
@ -247,10 +247,11 @@ PeiCore (
&PrivateData.PS, &PrivateData.PS,
PrivateData.HobList PrivateData.HobList
); );
//
// Should never reach here.
//
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
CpuDeadLoop();
return EFI_NOT_FOUND;
} }

2
MdePkg/Include/Library/DxeCoreEntryPoint.h
View File

@ -16,7 +16,7 @@
#define __MODULE_ENTRY_POINT_H__ #define __MODULE_ENTRY_POINT_H__
/// ///
/// Declare the cache of copy of HobList. /// Global variable that contains a pointer to the Hob List passed into the DXE Core entry point.
/// ///
extern VOID *gHobList; extern VOID *gHobList;

4
MdePkg/Include/Library/PeiCoreEntryPoint.h
View File

@ -88,8 +88,8 @@ EfiMain (
VOID VOID
EFIAPI EFIAPI
ProcessLibraryConstructorList ( ProcessLibraryConstructorList (
IN EFI_PEI_FILE_HANDLE *FfsHeader, IN EFI_PEI_FILE_HANDLE FileHandle,
IN EFI_PEI_SERVICES **PeiServices IN CONST EFI_PEI_SERVICES **PeiServices
); );

23
MdePkg/Include/Library/PeimEntryPoint.h
View File

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

3
MdePkg/Include/Library/UefiApplicationEntryPoint.h
View File

@ -18,7 +18,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
/// ///
/// Declare the EFI/UEFI Specification Revision to which this driver is implemented /// Declare the EFI/UEFI Specification Revision to which this driver is implemented
/// ///
extern const UINT32 _gUefiDriverRevision; extern CONST UINT32 _gUefiDriverRevision;
/** /**
Enrty point to UEFI Application. Enrty point to UEFI Application.

18
MdePkg/Include/Library/UefiDriverEntryPoint.h
View File

@ -18,27 +18,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
/// ///
/// Declare the EFI/UEFI Specification Revision to which this driver is implemented /// Declare the EFI/UEFI Specification Revision to which this driver is implemented
/// ///
extern const UINT32 _gUefiDriverRevision; extern CONST UINT32 _gUefiDriverRevision;
///
/// Declare the number of entry points in the image.
///
extern const UINT8 _gDriverEntryPointCount;
/// ///
/// Declare the number of unload handler in the image. /// Declare the number of unload handler in the image.
/// ///
extern const UINT8 _gDriverUnloadImageCount; extern CONST UINT8 _gDriverUnloadImageCount;
///
/// Declare the arrary of Boot Sevice Exit Event callbacks .
///
extern const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[];
///
/// Declare the arrary of Virtual Address Change Event callbacks .
///
extern const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[];
/** /**
Enrty point to DXE Driver. Enrty point to DXE Driver.

14
MdePkg/Library/PeimEntryPoint/PeimEntryPoint.c
View File

@ -31,8 +31,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
_ModuleEntryPoint ( _ModuleEntryPoint (
IN EFI_PEI_FILE_HANDLE *FfsHeader, IN EFI_PEI_FILE_HANDLE FileHandle,
IN EFI_PEI_SERVICES **PeiServices IN CONST EFI_PEI_SERVICES **PeiServices
) )
{ {
if (_gPeimRevision != 0) { if (_gPeimRevision != 0) {
@ -45,12 +45,12 @@ _ModuleEntryPoint (
// //
// Call constructor for all libraries // Call constructor for all libraries
// //
ProcessLibraryConstructorList (FfsHeader, PeiServices); ProcessLibraryConstructorList (FileHandle, PeiServices);
// //
// Call the driver entry point // Call the driver entry point
// //
return ProcessModuleEntryPointList (FfsHeader, PeiServices); return ProcessModuleEntryPointList (FileHandle, PeiServices);
} }
@ -66,9 +66,9 @@ _ModuleEntryPoint (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
EfiMain ( EfiMain (
IN EFI_PEI_FILE_HANDLE *FfsHeader, IN EFI_PEI_FILE_HANDLE FileHandle,
IN EFI_PEI_SERVICES **PeiServices IN CONST EFI_PEI_SERVICES **PeiServices
) )
{ {
return _ModuleEntryPoint (FfsHeader, PeiServices); return _ModuleEntryPoint (FileHandle, PeiServices);
} }