sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) Update SetPeiServicesTablePointer's prototype add CONST modifier.

Browse Source 
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:
qwang12
2008-10-21 05:55:27 +00:00
parent a86fda431e
commit 6c7a807a54
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
View File

@ -182,8 +182,8 @@ DiscoverPeimsAndOrderWithApriori (
**/ **/
VOID* VOID*
ShadowPeiCore( ShadowPeiCore(
EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
PEI_CORE_INSTANCE *PrivateInMem IN PEI_CORE_INSTANCE *PrivateInMem
) )
{ {
EFI_PEI_FILE_HANDLE PeiCoreFileHandle; EFI_PEI_FILE_HANDLE PeiCoreFileHandle;
@ -241,7 +241,7 @@ PeiDispatcher (
EFI_STATUS Status; EFI_STATUS Status;
UINT32 Index1; UINT32 Index1;
UINT32 Index2; UINT32 Index2;
EFI_PEI_SERVICES **PeiServices; CONST EFI_PEI_SERVICES **PeiServices;
EFI_PEI_FV_HANDLE VolumeHandle; EFI_PEI_FV_HANDLE VolumeHandle;
EFI_PEI_FILE_HANDLE PeimFileHandle; EFI_PEI_FILE_HANDLE PeimFileHandle;
UINTN FvCount; UINTN FvCount;
@ -268,7 +268,7 @@ PeiDispatcher (
UINTN OldCheckingBottom; UINTN OldCheckingBottom;
PeiServices = &Private->PS; PeiServices = (CONST EFI_PEI_SERVICES **) &Private->PS;
PeimEntryPoint = NULL; PeimEntryPoint = NULL;
PeimFileHandle = NULL; PeimFileHandle = NULL;
EntryPoint = 0; EntryPoint = 0;
@ -287,7 +287,7 @@ PeiDispatcher (
if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) { if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {
PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2]; PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];
Status = PeiLoadImage ( Status = PeiLoadImage (
&Private->PS, (CONST EFI_PEI_SERVICES **) &Private->PS,
PeimFileHandle, PeimFileHandle,
&EntryPoint, &EntryPoint,
&AuthenticationState &AuthenticationState
@ -347,7 +347,7 @@ PeiDispatcher (
// //
// Get this Fv Handle by PeiService FvFindNextVolume. // Get this Fv Handle by PeiService FvFindNextVolume.
// //
PeiFvFindNextVolume ((CONST EFI_PEI_SERVICES **) PeiServices, FvCount, &VolumeHandle); PeiFvFindNextVolume (PeiServices, FvCount, &VolumeHandle);
if (Private->CurrentPeimCount == 0) { if (Private->CurrentPeimCount == 0) {
// //
@ -549,7 +549,7 @@ PeiDispatcher (
PrivateInMem->HobList.Raw = (VOID*) ((UINTN) PrivateInMem->HobList.Raw + HeapOffset); PrivateInMem->HobList.Raw = (VOID*) ((UINTN) PrivateInMem->HobList.Raw + HeapOffset);
PrivateInMem->StackBase = (EFI_PHYSICAL_ADDRESS)(((UINTN)PrivateInMem->PhysicalMemoryBegin + EFI_PAGE_MASK) & ~EFI_PAGE_MASK); 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 // Fixup for PeiService's address

10
MdeModulePkg/Core/Pei/FwVol/FwVol.c
View File

@ -387,7 +387,7 @@ FirmwareVolmeInfoPpiNotifyCallback (
// //
// Process FvFile to install FvInfo ppi and build FvHob // Process FvFile to install FvInfo ppi and build FvHob
// //
ProcessFvFile (PeiServices, FileHandle, &AuthenticationStatus); ProcessFvFile ((CONST EFI_PEI_SERVICES **) PeiServices, FileHandle, &AuthenticationStatus);
} }
} while (FileHandle != NULL); } while (FileHandle != NULL);
} }
@ -837,9 +837,9 @@ PeiFfsGetVolumeInfo (
**/ **/
EFI_STATUS EFI_STATUS
ProcessFvFile ( ProcessFvFile (
IN EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_FILE_HANDLE FvFileHandle, IN EFI_PEI_FILE_HANDLE FvFileHandle,
OUT UINT32 *AuthenticationState OUT UINT32 *AuthenticationState
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
@ -871,7 +871,7 @@ ProcessFvFile (
// Find FvImage in FvFile // Find FvImage in FvFile
// //
Status = PeiFfsFindSectionData ( Status = PeiFfsFindSectionData (
(CONST EFI_PEI_SERVICES **) PeiServices, PeiServices,
EFI_SECTION_FIRMWARE_VOLUME_IMAGE, EFI_SECTION_FIRMWARE_VOLUME_IMAGE,
FvFileHandle, FvFileHandle,
(VOID **)&FvImageHandle (VOID **)&FvImageHandle

2
MdeModulePkg/Core/Pei/Image/Image.c
View File

@ -420,7 +420,7 @@ PeiLoadImageLoadImageWrapper (
**/ **/
EFI_STATUS EFI_STATUS
PeiLoadImage ( PeiLoadImage (
IN EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_FILE_HANDLE FileHandle, IN EFI_PEI_FILE_HANDLE FileHandle,
OUT EFI_PHYSICAL_ADDRESS *EntryPoint, OUT EFI_PHYSICAL_ADDRESS *EntryPoint,
OUT UINT32 *AuthenticationState OUT UINT32 *AuthenticationState

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

@ -809,7 +809,7 @@ PeiAllocatePool (
**/ **/
EFI_STATUS EFI_STATUS
PeiLoadImage ( PeiLoadImage (
IN EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_FILE_HANDLE FileHandle, IN EFI_PEI_FILE_HANDLE FileHandle,
OUT EFI_PHYSICAL_ADDRESS *EntryPoint, OUT EFI_PHYSICAL_ADDRESS *EntryPoint,
OUT UINT32 *AuthenticationState OUT UINT32 *AuthenticationState
@ -1023,9 +1023,9 @@ InitializeImageServices (
**/ **/
EFI_STATUS EFI_STATUS
ProcessFvFile ( ProcessFvFile (
IN EFI_PEI_SERVICES **PeiServices, IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_FILE_HANDLE FvFileHandle, IN EFI_PEI_FILE_HANDLE FvFileHandle,
OUT UINT32 *AuthenticationState OUT UINT32 *AuthenticationState
); );
#endif #endif

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

@ -165,7 +165,7 @@ PeiCore (
// //
// Save PeiServicePointer so that it can be retrieved anywhere. // Save PeiServicePointer so that it can be retrieved anywhere.
// //
SetPeiServicesTablePointer(&PrivateData.PS); SetPeiServicesTablePointer((CONST EFI_PEI_SERVICES **) &PrivateData.PS);
if (OldCoreData != NULL) { if (OldCoreData != NULL) {

8
MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
View File

@ -451,7 +451,7 @@ IScsiFormCallback (
CHAR8 Ip4String[IP4_STR_MAX_SIZE]; CHAR8 Ip4String[IP4_STR_MAX_SIZE];
CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN]; CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];
UINT64 Lun; UINT64 Lun;
STRING_REF DeviceFormTitleToken; EFI_STRING_ID DeviceFormTitleToken;
ISCSI_CONFIG_IFR_NVDATA *IfrNvData; ISCSI_CONFIG_IFR_NVDATA *IfrNvData;
ISCSI_CONFIG_FORM_ENTRY *ConfigFormEntry; ISCSI_CONFIG_FORM_ENTRY *ConfigFormEntry;
EFI_IP_ADDRESS HostIp; EFI_IP_ADDRESS HostIp;
@ -675,7 +675,7 @@ IScsiFormCallback (
ASSERT (ConfigFormEntry != NULL); ASSERT (ConfigFormEntry != NULL);
UnicodeSPrint (PortString, (UINTN) 128, L"Port %s", ConfigFormEntry->MacString); UnicodeSPrint (PortString, (UINTN) 128, L"Port %s", ConfigFormEntry->MacString);
DeviceFormTitleToken = (STRING_REF) STR_ISCSI_DEVICE_FORM_TITLE; DeviceFormTitleToken = (EFI_STRING_ID) STR_ISCSI_DEVICE_FORM_TITLE;
HiiLibSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString); HiiLibSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString);
IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData); IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData);
@ -800,13 +800,13 @@ IScsiConfigUpdateForm (
ZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData)); ZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));
} }
// //
// Compose the Port string and create a new STRING_REF. // Compose the Port string and create a new EFI_STRING_ID.
// //
UnicodeSPrint (PortString, 128, L"Port %s", ConfigFormEntry->MacString); UnicodeSPrint (PortString, 128, L"Port %s", ConfigFormEntry->MacString);
HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleToken, PortString); HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleToken, PortString);
// //
// Compose the help string of this port and create a new STRING_REF. // Compose the help string of this port and create a new EFI_STRING_ID.
// //
UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString); UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);
HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString); HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);

4
MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
View File

@ -67,8 +67,8 @@ typedef struct _ISCSI_CONFIG_FORM_ENTRY {
LIST_ENTRY Link; LIST_ENTRY Link;
EFI_HANDLE Controller; EFI_HANDLE Controller;
CHAR16 MacString[95]; CHAR16 MacString[95];
STRING_REF PortTitleToken; EFI_STRING_ID PortTitleToken;
STRING_REF PortTitleHelpToken; EFI_STRING_ID PortTitleHelpToken;
ISCSI_SESSION_CONFIG_NVDATA SessionConfigData; ISCSI_SESSION_CONFIG_NVDATA SessionConfigData;
ISCSI_CHAP_AUTH_CONFIG_NVDATA AuthConfigData; ISCSI_CHAP_AUTH_CONFIG_NVDATA AuthConfigData;