From 6ba0bc7c4ec0aa1df5ca5c5ac788ad6516eaa2ee Mon Sep 17 00:00:00 2001 From: jljusten Date: Mon, 13 Apr 2009 23:07:44 +0000 Subject: Fix some inconsistencies in EFIAPI usage. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8076 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/BootMaint/BBSsupport.c | 4 ++ .../Universal/BdsDxe/BootMaint/BBSsupport.h | 53 ---------------------- .../Universal/BdsDxe/BootMaint/BootMaint.c | 1 + .../Universal/BdsDxe/BootMaint/BootMaint.h | 33 -------------- 4 files changed, 5 insertions(+), 86 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint') diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c index 94261a0bef..5d94bc0760 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c @@ -401,6 +401,7 @@ BdsIsLegacyBootOption ( @retval EFI_NOT_FOUND Fail to retrive variable of boot order. **/ EFI_STATUS +EFIAPI BdsDeleteAllInvalidLegacyBootOptions ( VOID ) @@ -682,6 +683,7 @@ BdsCreateOneLegacyBootOption ( **/ EFI_STATUS +EFIAPI BdsAddNonExistingLegacyBootOptions ( VOID ) @@ -974,6 +976,7 @@ BdsCreateDevOrder ( **/ EFI_STATUS +EFIAPI BdsUpdateLegacyDevOrder ( VOID ) @@ -1531,6 +1534,7 @@ PrintBbsTable ( @return status of BdsSetBootPriority4SameTypeDev() **/ EFI_STATUS +EFIAPI BdsRefreshBbsTableForBoot ( IN BDS_COMMON_OPTION *Entry ) diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h index fee8bdbac5..711b1096a6 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h @@ -38,57 +38,4 @@ BdsBuildLegacyDevNameString ( OUT CHAR16 *BootString ); -/** - Delete all the invalid legacy boot options. - - - - @retval EFI_SUCCESS All invalide legacy boot options are deleted. - @retval EFI_OUT_OF_RESOURCES Fail to allocate necessary memory. - @retval EFI_NOT_FOUND Fail to retrive variable of boot order. -**/ -EFI_STATUS -BdsDeleteAllInvalidLegacyBootOptions ( - VOID - ); - -/** - - Add the legacy boot options from BBS table if they do not exist. - - @retval EFI_SUCCESS The boot options are added successfully or they are already in boot options. - @retval others An error occurred when creating legacy boot options. - -**/ -EFI_STATUS -BdsAddNonExistingLegacyBootOptions ( - VOID - ); - -/** - - Add the legacy boot devices from BBS table into - the legacy device boot order. - - @retval EFI_SUCCESS The boot devices are added successfully. - -**/ -EFI_STATUS -BdsUpdateLegacyDevOrder ( - VOID - ); - -/** - Set the boot priority for BBS entries based on boot option entry and boot order. - - @param Entry The boot option is to be checked for refresh BBS table. - - @retval EFI_SUCCESS The boot priority for BBS entries is refreshed successfully. - @return status of BdsSetBootPriority4SameTypeDev() -**/ -EFI_STATUS -BdsRefreshBbsTableForBoot ( - IN BDS_COMMON_OPTION *Entry - ); - #endif diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c index 98aadd6ce1..3f5bbc40c2 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c @@ -1383,6 +1383,7 @@ FormSetDispatcher ( **/ EFI_STATUS +EFIAPI BdsDeleteBootOption ( IN UINTN OptionNumber, IN OUT UINT16 *BootOrder, diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h index 2db13372af..49a279342f 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h @@ -1191,19 +1191,6 @@ EfiLibFileInfo ( IN EFI_FILE_HANDLE FHand ); -/** - This function converts an input device structure to a Unicode string. - - @param DevPath A pointer to the device path structure. - - @return A new allocated Unicode string that represents the device path. - -**/ -CHAR16 * -DevicePathToStr ( - EFI_DEVICE_PATH_PROTOCOL *DevPath - ); - /** Find the first instance of this Protocol in the system and return it's interface. @@ -1238,26 +1225,6 @@ EfiReallocatePool ( IN UINTN NewSize ); -/** - Read the EFI variable (VendorGuid/Name) and return a dynamically allocated - buffer, and the size of the buffer. If failure return NULL. - - @param Name String part of EFI variable name - @param VendorGuid GUID part of EFI variable name - @param VarSize Returns the size of the EFI variable that was read - - @return Dynamically allocated memory that contains a copy of the EFI variable. - @return Caller is responsible freeing the buffer. - @retval NULL Variable was not read - -**/ -VOID * -BdsLibGetVariableAndSize ( - IN CHAR16 *Name, - IN EFI_GUID *VendorGuid, - OUT UINTN *VarSize - ); - /** Function deletes the variable specified by VarName and VarGuid. -- cgit v1.2.3