1) Update SetPeiServicesTablePointer's prototype add CONST modifier.
2) Move STRING_REF from MdePkg/Include/Uefi/UefiBaseType.h to IntelFramework/Include/Protocol/FrameworkHii.h. 3) Move RELOFST from MdePkg/Include/Uefi/UefiInternalFormRepresentation.h to IntelFramework/Include/Protocol/FrameworkHii.h. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6166 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -182,8 +182,8 @@ DiscoverPeimsAndOrderWithApriori (
|
||||
**/
|
||||
VOID*
|
||||
ShadowPeiCore(
|
||||
EFI_PEI_SERVICES **PeiServices,
|
||||
PEI_CORE_INSTANCE *PrivateInMem
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN PEI_CORE_INSTANCE *PrivateInMem
|
||||
)
|
||||
{
|
||||
EFI_PEI_FILE_HANDLE PeiCoreFileHandle;
|
||||
@@ -241,7 +241,7 @@ PeiDispatcher (
|
||||
EFI_STATUS Status;
|
||||
UINT32 Index1;
|
||||
UINT32 Index2;
|
||||
EFI_PEI_SERVICES **PeiServices;
|
||||
CONST EFI_PEI_SERVICES **PeiServices;
|
||||
EFI_PEI_FV_HANDLE VolumeHandle;
|
||||
EFI_PEI_FILE_HANDLE PeimFileHandle;
|
||||
UINTN FvCount;
|
||||
@@ -268,7 +268,7 @@ PeiDispatcher (
|
||||
UINTN OldCheckingBottom;
|
||||
|
||||
|
||||
PeiServices = &Private->PS;
|
||||
PeiServices = (CONST EFI_PEI_SERVICES **) &Private->PS;
|
||||
PeimEntryPoint = NULL;
|
||||
PeimFileHandle = NULL;
|
||||
EntryPoint = 0;
|
||||
@@ -287,7 +287,7 @@ PeiDispatcher (
|
||||
if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {
|
||||
PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];
|
||||
Status = PeiLoadImage (
|
||||
&Private->PS,
|
||||
(CONST EFI_PEI_SERVICES **) &Private->PS,
|
||||
PeimFileHandle,
|
||||
&EntryPoint,
|
||||
&AuthenticationState
|
||||
@@ -347,7 +347,7 @@ PeiDispatcher (
|
||||
//
|
||||
// Get this Fv Handle by PeiService FvFindNextVolume.
|
||||
//
|
||||
PeiFvFindNextVolume ((CONST EFI_PEI_SERVICES **) PeiServices, FvCount, &VolumeHandle);
|
||||
PeiFvFindNextVolume (PeiServices, FvCount, &VolumeHandle);
|
||||
|
||||
if (Private->CurrentPeimCount == 0) {
|
||||
//
|
||||
@@ -549,7 +549,7 @@ PeiDispatcher (
|
||||
PrivateInMem->HobList.Raw = (VOID*) ((UINTN) PrivateInMem->HobList.Raw + HeapOffset);
|
||||
PrivateInMem->StackBase = (EFI_PHYSICAL_ADDRESS)(((UINTN)PrivateInMem->PhysicalMemoryBegin + EFI_PAGE_MASK) & ~EFI_PAGE_MASK);
|
||||
|
||||
PeiServices = &PrivateInMem->PS;
|
||||
PeiServices = (CONST EFI_PEI_SERVICES **) &PrivateInMem->PS;
|
||||
|
||||
//
|
||||
// Fixup for PeiService's address
|
||||
|
@@ -387,7 +387,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
|
||||
//
|
||||
// Process FvFile to install FvInfo ppi and build FvHob
|
||||
//
|
||||
ProcessFvFile (PeiServices, FileHandle, &AuthenticationStatus);
|
||||
ProcessFvFile ((CONST EFI_PEI_SERVICES **) PeiServices, FileHandle, &AuthenticationStatus);
|
||||
}
|
||||
} while (FileHandle != NULL);
|
||||
}
|
||||
@@ -837,9 +837,9 @@ PeiFfsGetVolumeInfo (
|
||||
**/
|
||||
EFI_STATUS
|
||||
ProcessFvFile (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FvFileHandle,
|
||||
OUT UINT32 *AuthenticationState
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FvFileHandle,
|
||||
OUT UINT32 *AuthenticationState
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
@@ -871,7 +871,7 @@ ProcessFvFile (
|
||||
// Find FvImage in FvFile
|
||||
//
|
||||
Status = PeiFfsFindSectionData (
|
||||
(CONST EFI_PEI_SERVICES **) PeiServices,
|
||||
PeiServices,
|
||||
EFI_SECTION_FIRMWARE_VOLUME_IMAGE,
|
||||
FvFileHandle,
|
||||
(VOID **)&FvImageHandle
|
||||
|
@@ -420,7 +420,7 @@ PeiLoadImageLoadImageWrapper (
|
||||
**/
|
||||
EFI_STATUS
|
||||
PeiLoadImage (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FileHandle,
|
||||
OUT EFI_PHYSICAL_ADDRESS *EntryPoint,
|
||||
OUT UINT32 *AuthenticationState
|
||||
|
@@ -809,7 +809,7 @@ PeiAllocatePool (
|
||||
**/
|
||||
EFI_STATUS
|
||||
PeiLoadImage (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FileHandle,
|
||||
OUT EFI_PHYSICAL_ADDRESS *EntryPoint,
|
||||
OUT UINT32 *AuthenticationState
|
||||
@@ -1023,9 +1023,9 @@ InitializeImageServices (
|
||||
**/
|
||||
EFI_STATUS
|
||||
ProcessFvFile (
|
||||
IN EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FvFileHandle,
|
||||
OUT UINT32 *AuthenticationState
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices,
|
||||
IN EFI_PEI_FILE_HANDLE FvFileHandle,
|
||||
OUT UINT32 *AuthenticationState
|
||||
);
|
||||
|
||||
#endif
|
||||
|
@@ -165,7 +165,7 @@ PeiCore (
|
||||
//
|
||||
// Save PeiServicePointer so that it can be retrieved anywhere.
|
||||
//
|
||||
SetPeiServicesTablePointer(&PrivateData.PS);
|
||||
SetPeiServicesTablePointer((CONST EFI_PEI_SERVICES **) &PrivateData.PS);
|
||||
|
||||
if (OldCoreData != NULL) {
|
||||
|
||||
|
Reference in New Issue
Block a user