Fix some inconsistencies in EFIAPI usage.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8076 6f19259b-4bc3-4df7-8a09-765794883524
2009-04-13 23:07:44 +00:00 · 2009-04-13 23:07:44 +00:00 · 6ba0bc7c4e
parent 3b6c90a16b
commit 6ba0bc7c4e
12 changed files with 16 additions and 88 deletions
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
@ -122,6 +122,7 @@ GetResponse (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationSetOptions (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
  IN  EFI_HANDLE                                             ControllerHandle,
@ -219,6 +220,7 @@ IDEBusDriverConfigurationSetOptions (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationOptionsValid (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
  IN  EFI_HANDLE                                      ControllerHandle,
@ -294,6 +296,7 @@ IDEBusDriverConfigurationOptionsValid (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationForceDefaults (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
  IN  EFI_HANDLE                                             ControllerHandle,
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c
@ -89,6 +89,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_DRIVER_DIAGNOSTICS2_PROTOCOL gIDEBusDriverDiag

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverDiagnosticsRunDiagnostics (
  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,
  IN  EFI_HANDLE                                    ControllerHandle,
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@ -211,6 +211,7 @@ IDEBusDriverBindingStop (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationSetOptions (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
  IN  EFI_HANDLE                                             ControllerHandle,
@ -230,6 +231,7 @@ IDEBusDriverConfigurationSetOptions (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationOptionsValid (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,
  IN  EFI_HANDLE                                      ControllerHandle,
@ -249,6 +251,7 @@ IDEBusDriverConfigurationOptionsValid (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverConfigurationForceDefaults (
  IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,
  IN  EFI_HANDLE                                             ControllerHandle,
@ -276,6 +279,7 @@ IDEBusDriverConfigurationForceDefaults (

 **/
 EFI_STATUS
+EFIAPI
 IDEBusDriverDiagnosticsRunDiagnostics (
  IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,
  IN  EFI_HANDLE                                    ControllerHandle,
--- a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
@ -1015,7 +1015,6 @@ BdsLibConnectUsbDevByShortFormDP(

 **/
 VOID
-EFIAPI
 DevPathVendor (
  IN OUT POOL_PRINT       *Str,
  IN VOID                 *DevPath
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
@ -177,7 +177,6 @@ DevPathController (

 **/
 VOID
-EFIAPI
 DevPathVendor (
  IN OUT POOL_PRINT       *Str,
  IN VOID                 *DevPath
--- 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
  )
--- 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
--- 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,
--- 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.

--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
@ -311,6 +311,7 @@ UnregisterHotkey (
  @return  EFI_NOT_FOUND Fail to find boot option variable.
 **/
 EFI_STATUS
+EFIAPI
 HotkeyCallback (
  IN EFI_KEY_DATA     *KeyData
 )
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@ -85,6 +85,7 @@ DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {

 **/
 EFI_STATUS
+EFIAPI
 DxeStatusCodeDriverEntry (
  IN EFI_HANDLE         ImageHandle,
  IN EFI_SYSTEM_TABLE   *SystemTable
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@ -105,6 +105,7 @@ ReportDispatcher (

 **/
 EFI_STATUS
+EFIAPI
 PeiStatusCodeDriverEntry (
  IN       EFI_PEI_FILE_HANDLE  FileHandle,
  IN CONST EFI_PEI_SERVICES     **PeiServices