From: vanjeff Date: Mon, 18 Sep 2006 02:44:41 +0000 (+0000) Subject: added EFIAPI for those constructor functions X-Git-Tag: edk2-stable201903~24326 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=7f47bef3d84592acab50329f58a0de76d150dd50 added EFIAPI for those constructor functions git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1548 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.c b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.c index 300cc91fed..8b58cfa5ea 100644 --- a/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.c +++ b/EdkModulePkg/Library/DxeCoreCustomDecompressLibFromHob/DxeCoreCustomDecompressLibFromHob.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -15,13 +15,14 @@ Module Name: Abstract: - Custom Decompress Library from HOBs + Custom Decompress Library from HOBs --*/ static DECOMPRESS_LIBRARY mCustomDecompress; EFI_STATUS +EFIAPI DxeCoreCustomDecompressLibConstructor ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -40,7 +41,7 @@ Returns: GuidHob = GetFirstGuidHob (&gEfiCustomizedDecompressProtocolGuid); ASSERT (GuidHob != NULL); - CopyMem (&mCustomDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mCustomDecompress)); + CopyMem (&mCustomDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mCustomDecompress)); return EFI_SUCCESS; } diff --git a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.c b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.c index 1bb832be02..54f0bc22f0 100644 --- a/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.c +++ b/EdkModulePkg/Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -15,13 +15,14 @@ Module Name: Abstract: - Tiano Decompress Library from HOBs + Tiano Decompress Library from HOBs --*/ static DECOMPRESS_LIBRARY mTianoDecompress; EFI_STATUS +EFIAPI DxeCoreTianoDecompressLibConstructor ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -39,8 +40,8 @@ Returns: EFI_HOB_GUID_TYPE *GuidHob; GuidHob = GetFirstGuidHob (&gEfiTianoDecompressProtocolGuid); - ASSERT (GuidHob != NULL); - CopyMem (&mTianoDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mTianoDecompress)); + ASSERT (GuidHob != NULL); + CopyMem (&mTianoDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mTianoDecompress)); return EFI_SUCCESS; } diff --git a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.c b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.c index b4bd539975..d0bf854fb6 100644 --- a/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.c +++ b/EdkModulePkg/Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -15,13 +15,14 @@ Module Name: Abstract: - UEFI Decompress Library from HOBs + UEFI Decompress Library from HOBs --*/ static DECOMPRESS_LIBRARY mEfiDecompress; EFI_STATUS +EFIAPI DxeCoreUefiDecompressLibConstructor ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -40,7 +41,7 @@ Returns: GuidHob = GetFirstGuidHob (&gEfiDecompressProtocolGuid); ASSERT (GuidHob != NULL); - CopyMem (&mEfiDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mEfiDecompress)); + CopyMem (&mEfiDecompress, GET_GUID_HOB_DATA (GuidHob), sizeof (mEfiDecompress)); return EFI_SUCCESS; } diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c index 58ad6f538c..2436303483 100644 --- a/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c +++ b/EdkModulePkg/Library/EdkFvbServiceLib/Ipf/Fvb.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -26,6 +26,7 @@ Abstract: --*/ EFI_STATUS +EFIAPI FvbLibInitialize ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -38,7 +39,7 @@ Routine Description: Arguments: None -Returns: +Returns: EFI_SUCCESS --*/ @@ -155,7 +156,7 @@ Routine Description: resulting attributes in output parameter Arguments: - Instance - The FV instance whose attributes is going to be + Instance - The FV instance whose attributes is going to be returned Attributes - Output buffer which contains attributes @@ -177,13 +178,13 @@ EfiFvbSetVolumeAttributes ( /*++ Routine Description: - Modifies the current settings of the firmware volume according to the + Modifies the current settings of the firmware volume according to the input parameter, and returns the new setting of the volume Arguments: - Instance - The FV instance whose attributes is going to be + Instance - The FV instance whose attributes is going to be modified - Attributes - On input, it is a pointer to EFI_FVB_ATTRIBUTES + Attributes - On input, it is a pointer to EFI_FVB_ATTRIBUTES containing the desired firmware volume settings. On successful return, it contains the new settings of the firmware volume @@ -211,9 +212,9 @@ Routine Description: Arguments: Instance - The FV instance whose base address is going to be returned - BaseAddress - Pointer to a caller allocated EFI_PHYSICAL_ADDRESS + BaseAddress - Pointer to a caller allocated EFI_PHYSICAL_ADDRESS that on successful return, contains the base address - of the firmware volume. + of the firmware volume. Returns: Status code @@ -249,7 +250,7 @@ Arguments: BlockSize Returns: - EFI_SUCCESS - The firmware volume was read successfully and + EFI_SUCCESS - The firmware volume was read successfully and contents are in Buffer --*/ @@ -285,7 +286,7 @@ Routine Description: Arguments: Instance - The FV instance to be erased StartLba - The starting logical block index to be erased - OffsetStartLba - Offset into the starting block at which to + OffsetStartLba - Offset into the starting block at which to begin erasing LastLba - The last logical block index to be erased OffsetLastLba - Offset into the last block at which to end erasing diff --git a/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c b/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c index 6d0a84de5e..f4d9d4f39e 100644 --- a/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c +++ b/EdkModulePkg/Library/EdkIfrSupportLib/IfrCommon.c @@ -1,12 +1,12 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: IfrCommon.c @@ -20,6 +20,7 @@ Revision History: --*/ EFI_STATUS +EFIAPI IfrLibConstruct ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -37,12 +38,12 @@ GetCurrentLanguage ( Routine Description: Determine what is the current language setting - + Arguments: - + Lang - Pointer of system language - -Returns: + +Returns: Status code @@ -99,21 +100,21 @@ AddString ( Routine Description: Add a string to the incoming buffer and return the token and offset data - + Arguments: - + StringBuffer - The incoming buffer - + Language - Currrent language - + String - The string to be added - + StringToken - The index where the string placed - -Returns: + +Returns: EFI_OUT_OF_RESOURCES - No enough buffer to allocate - + EFI_SUCCESS - String successfully added to the incoming buffer --*/ @@ -171,11 +172,11 @@ Returns: // PackDestination[Index] = (UINT16) (PackDestination[Index] + sizeof (RELOFST)); } - + // // Add a new stringpointer in the new buffer since we are adding a string. Null terminate it // - PackDestination[Index] = (UINT16)(PackDestination[Index-1] + + PackDestination[Index] = (UINT16)(PackDestination[Index-1] + StrSize((CHAR16 *)((CHAR8 *)(StringPack) + PackSource[Index-1]))); PackDestination[Index + 1] = (UINT16) 0; @@ -206,7 +207,7 @@ Returns: Destination = Destination + StrSize ((CHAR16 *) Source); Source = Source + StrSize ((CHAR16 *) Source); } - + // // This copies the new string to the destination buffer // @@ -238,7 +239,7 @@ Returns: StringPackBuffer = (EFI_HII_STRING_PACK *) ((CHAR8 *) (StringPackBuffer) + StringPack->Header.Length); StringPack = (EFI_HII_STRING_PACK *) ((CHAR8 *) (StringPack) + StringPack->Header.Length); } - + // // If we didn't copy the new data to a stringpack yet // @@ -316,17 +317,17 @@ AddOpCode ( Routine Description: Add op-code data to the FormBuffer - + Arguments: - + FormBuffer - Form buffer to be inserted to - + OpCodeData - Op-code data to be inserted - -Returns: + +Returns: EFI_OUT_OF_RESOURCES - No enough buffer to allocate - + EFI_SUCCESS - Op-code data successfully inserted --*/ @@ -432,12 +433,12 @@ GetHiiInterface ( Routine Description: Get the HII protocol interface - + Arguments: - + Hii - HII protocol interface - -Returns: + +Returns: Status code @@ -470,27 +471,27 @@ ExtractDataFromHiiHandle ( Routine Description: Extract information pertaining to the HiiHandle - + Arguments: - + HiiHandle - Hii handle - + ImageLength - For input, length of DefaultImage; For output, length of actually required - + DefaultImage - Image buffer prepared by caller - + Guid - Guid information about the form - -Returns: + +Returns: EFI_OUT_OF_RESOURCES - No enough buffer to allocate - + EFI_BUFFER_TOO_SMALL - DefualtImage has no enough ImageLength - + EFI_SUCCESS - Successfully extract data from Hii database. - - + + --*/ { EFI_STATUS Status; @@ -581,7 +582,7 @@ Returns: Index = RawData[Index + 1] + Index; } - + // // Return an error if buffer is too small // @@ -649,9 +650,9 @@ Routine Description: Finds HII handle for given pack GUID previously registered with the HII. Arguments: - HiiProtocol - pointer to pointer to HII protocol interface. + HiiProtocol - pointer to pointer to HII protocol interface. If NULL, the interface will be found but not returned. - If it points to NULL, the interface will be found and + If it points to NULL, the interface will be found and written back to the pointer that is pointed to. Guid - The GUID of the pack that registered with the HII. @@ -766,7 +767,7 @@ Routine Description: Validate that the data associated with the HiiHandle in NVRAM is within the reasonable parameters for that FormSet. Values for strings and passwords are not verified due to their not having the equivalent of valid range settings. - + Arguments: HiiHandle - Handle of the HII database entry to query @@ -774,11 +775,11 @@ Arguments: Results - If return Status is EFI_SUCCESS, Results provides valid data TRUE = NVRAM Data is within parameters FALSE = NVRAM Data is NOT within parameters - -Returns: + +Returns: EFI_OUT_OF_RESOURCES - No enough buffer to allocate - + EFI_SUCCESS - Data successfully validated --*/ { @@ -880,7 +881,7 @@ Returns: Index = RawData[Index + 1] + Index; } - + // // Allocate memory for our File Form Tags // diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c index d06e57a6d7..47446d3a43 100644 --- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c +++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoader.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -25,8 +25,9 @@ Abstract: EFI_PEI_PE_COFF_LOADER_PROTOCOL *mPeiEfiPeiPeCoffLoader; EFI_STATUS +EFIAPI PeCoffLoaderConstructor ( - IN EFI_FFS_FILE_HEADER *FfsHeader, + IN EFI_FFS_FILE_HEADER *FfsHeader, IN EFI_PEI_SERVICES **PeiServices ) {