Fix some inconsistencies in EFIAPI usage.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8076 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
index 1816e2d0a56460b3d0c1311e92fa711dc012be77..97e51b2b0be562d3f12cf3796c2d3101e442c761 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c
@@ -122,6 +122,7 @@ GetResponse (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationSetOptions (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r
 IDEBusDriverConfigurationSetOptions (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r


@@ -219,6 +220,7 @@ IDEBusDriverConfigurationSetOptions (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationOptionsValid (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r
 IDEBusDriverConfigurationOptionsValid (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r


@@ -294,6 +296,7 @@ IDEBusDriverConfigurationOptionsValid (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationForceDefaults (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r
 IDEBusDriverConfigurationForceDefaults (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverDiagnostics.c
index e28c93d34633afe474cd9488ab7c953f8a5ec2f2..85d2bf3ad8720cc125b3cd22da0ed75a7d4fb369 100644 (file)
--- 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
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverDiagnosticsRunDiagnostics (\r
   IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                    ControllerHandle,\r
 IDEBusDriverDiagnosticsRunDiagnostics (\r
   IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                    ControllerHandle,\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
index 0fdacfed829220de447f2bf1378c6ea508a07f1d..d0a7e0ab88d227c0768920481af24e0e30176cb1 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBus.h
@@ -211,6 +211,7 @@ IDEBusDriverBindingStop (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationSetOptions (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r
 IDEBusDriverConfigurationSetOptions (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r


@@ -230,6 +231,7 @@ IDEBusDriverConfigurationSetOptions (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationOptionsValid (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r
 IDEBusDriverConfigurationOptionsValid (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                      ControllerHandle,\r


@@ -249,6 +251,7 @@ IDEBusDriverConfigurationOptionsValid (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverConfigurationForceDefaults (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r
 IDEBusDriverConfigurationForceDefaults (\r
   IN  EFI_DRIVER_CONFIGURATION_PROTOCOL                      *This,\r
   IN  EFI_HANDLE                                             ControllerHandle,\r


@@ -276,6 +279,7 @@ IDEBusDriverConfigurationForceDefaults (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 IDEBusDriverDiagnosticsRunDiagnostics (\r
   IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                    ControllerHandle,\r
 IDEBusDriverDiagnosticsRunDiagnostics (\r
   IN  EFI_DRIVER_DIAGNOSTICS_PROTOCOL               *This,\r
   IN  EFI_HANDLE                                    ControllerHandle,\r

diff --git a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
index 7d1077d713d9094beb29297cb56a2b8510c1d148..a262093865a6c37682a569dc9168082fb10438a4 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
@@ -1015,7 +1015,6 @@ BdsLibConnectUsbDevByShortFormDP(
 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r

-EFIAPI\r

 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r
 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
index c51137f57a34599254e8fe2e7293d738a3c9783c..bfc668f5b7acb5112dd7b57ba3ea4e49bca4864b 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/DevicePath.c
@@ -177,7 +177,6 @@ DevPathController (
 \r
 **/\r
 VOID\r
 \r
 **/\r
 VOID\r

-EFIAPI\r

 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r
 DevPathVendor (\r
   IN OUT POOL_PRINT       *Str,\r
   IN VOID                 *DevPath\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 94261a0bef5824ed75e7e32a48fdb9a691bfb033..5d94bc0760c62233a1e01e7c2426a3bfbe999e84 100644 (file)
--- 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.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND           Fail to retrive variable of boot order.\r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 BdsDeleteAllInvalidLegacyBootOptions (\r
   VOID\r
   )\r
 BdsDeleteAllInvalidLegacyBootOptions (\r
   VOID\r
   )\r


@@ -682,6 +683,7 @@ BdsCreateOneLegacyBootOption (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 BdsAddNonExistingLegacyBootOptions (\r
   VOID\r
   )\r
 BdsAddNonExistingLegacyBootOptions (\r
   VOID\r
   )\r


@@ -974,6 +976,7 @@ BdsCreateDevOrder (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 BdsUpdateLegacyDevOrder (\r
   VOID\r
   )\r
 BdsUpdateLegacyDevOrder (\r
   VOID\r
   )\r


@@ -1531,6 +1534,7 @@ PrintBbsTable (
   @return status of BdsSetBootPriority4SameTypeDev()\r
 **/\r
 EFI_STATUS\r
   @return status of BdsSetBootPriority4SameTypeDev()\r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 BdsRefreshBbsTableForBoot (\r
   IN BDS_COMMON_OPTION        *Entry\r
   )\r
 BdsRefreshBbsTableForBoot (\r
   IN BDS_COMMON_OPTION        *Entry\r
   )\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
index fee8bdbac52e2e4178a2317686aaffc6a3864c19..711b1096a644825ed80896890b111836b5c884f3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
@@ -38,57 +38,4 @@ BdsBuildLegacyDevNameString (
   OUT CHAR16                       *BootString\r
   );\r
 \r
   OUT CHAR16                       *BootString\r
   );\r
 \r

-/**\r
-  Delete all the invalid legacy boot options.\r
-\r
-  \r
-\r
-  @retval EFI_SUCCESS             All invalide legacy boot options are deleted.\r
-  @retval EFI_OUT_OF_RESOURCES    Fail to allocate necessary memory.\r
-  @retval EFI_NOT_FOUND           Fail to retrive variable of boot order.\r
-**/\r
-EFI_STATUS\r
-BdsDeleteAllInvalidLegacyBootOptions (\r
-  VOID\r
-  );\r
-\r
-/**\r
-\r
-  Add the legacy boot options from BBS table if they do not exist.\r
-\r
-  @retval  EFI_SUCCESS        The boot options are added successfully or they are already in boot options.\r
-  @retval  others             An error occurred when creating legacy boot options.\r
-\r
-**/\r
-EFI_STATUS\r
-BdsAddNonExistingLegacyBootOptions (\r
-  VOID\r
-  );\r
-\r
-/**\r
-\r
-  Add the legacy boot devices from BBS table into \r
-  the legacy device boot order.\r
-\r
-  @retval EFI_SUCCESS       The boot devices are added successfully.\r
-\r
-**/\r
-EFI_STATUS\r
-BdsUpdateLegacyDevOrder (\r
-  VOID\r
-  );\r
-\r
-/**\r
-  Set the boot priority for BBS entries based on boot option entry and boot order.\r
-\r
-  @param  Entry             The boot option is to be checked for refresh BBS table.\r
-  \r
-  @retval EFI_SUCCESS       The boot priority for BBS entries is refreshed successfully.\r
-  @return status of BdsSetBootPriority4SameTypeDev()\r
-**/\r
-EFI_STATUS\r
-BdsRefreshBbsTableForBoot (\r
-  IN BDS_COMMON_OPTION        *Entry\r
-  );\r
-\r

 #endif\r
 #endif\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 98aadd6ce187cd1f3ebe407089381c084c866c04..3f5bbc40c2138de67df62d7ec125b97b21ded0d1 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -1383,6 +1383,7 @@ FormSetDispatcher (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 BdsDeleteBootOption (\r
   IN UINTN                       OptionNumber,\r
   IN OUT UINT16                  *BootOrder,\r
 BdsDeleteBootOption (\r
   IN UINTN                       OptionNumber,\r
   IN OUT UINT16                  *BootOrder,\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 2db13372af549c7c059cf5e359b589bdc3333e72..49a279342f9fa18ba0a7c970cd9925b49ce89c54 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -1191,19 +1191,6 @@ EfiLibFileInfo (
   IN EFI_FILE_HANDLE      FHand\r
   );\r
 \r
   IN EFI_FILE_HANDLE      FHand\r
   );\r
 \r

-/**\r
-  This function converts an input device structure to a Unicode string.\r
-\r
-  @param DevPath                  A pointer to the device path structure.\r
-\r
-  @return A new allocated Unicode string that represents the device path.\r
-\r
-**/\r
-CHAR16 *\r
-DevicePathToStr (\r
-  EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
-  );\r
-\r

 /**\r
   Find the first instance of this Protocol in the system and return it's interface.\r
 \r
 /**\r
   Find the first instance of this Protocol in the system and return it's interface.\r
 \r


@@ -1238,26 +1225,6 @@ EfiReallocatePool (
   IN UINTN                NewSize\r
   );\r
 \r
   IN UINTN                NewSize\r
   );\r
 \r

-/**\r
-  Read the EFI variable (VendorGuid/Name) and return a dynamically allocated\r
-  buffer, and the size of the buffer. If failure return NULL.\r
-\r
-  @param  Name                  String part of EFI variable name\r
-  @param  VendorGuid            GUID part of EFI variable name\r
-  @param  VarSize               Returns the size of the EFI variable that was read\r
-\r
-  @return Dynamically allocated memory that contains a copy of the EFI variable.\r
-  @return Caller is responsible freeing the buffer.\r
-  @retval NULL                  Variable was not read\r
-\r
-**/\r
-VOID *\r
-BdsLibGetVariableAndSize (\r
-  IN CHAR16               *Name,\r
-  IN EFI_GUID             *VendorGuid,\r
-  OUT UINTN               *VarSize\r
-  );\r
-\r

 /**\r
   Function deletes the variable specified by VarName and VarGuid.\r
 \r
 /**\r
   Function deletes the variable specified by VarName and VarGuid.\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Hotkey.c
index 8843ec0b70d30efb798b612a08fb33531174f947..3ce9c0ebad6753a6a4150b14686a3fe717f060fe 100644 (file)
--- 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.\r
 **/\r
 EFI_STATUS\r
   @return  EFI_NOT_FOUND Fail to find boot option variable.\r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 HotkeyCallback (\r
   IN EFI_KEY_DATA     *KeyData\r
 )\r
 HotkeyCallback (\r
   IN EFI_KEY_DATA     *KeyData\r
 )\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
index 558e7f5da60907316190a8f5716a8a5157ef6464..954e82740588f2537c27c5b4fa5549dc36abc71c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCodeCommon.c
@@ -85,6 +85,7 @@ DXE_STATUS_CODE_CONTROLLER gDxeStatusCode = {
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r
 DxeStatusCodeDriverEntry (\r
   IN EFI_HANDLE         ImageHandle,\r
   IN EFI_SYSTEM_TABLE   *SystemTable\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index f14729157432c65bb028fb4ecda9773ec382eee7..cd6b5e5033a86322b99b0924e7690c048f9a9e1e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -105,6 +105,7 @@ ReportDispatcher (
 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r

+EFIAPI\r

 PeiStatusCodeDriverEntry (\r
   IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
   IN CONST EFI_PEI_SERVICES     **PeiServices\r
 PeiStatusCodeDriverEntry (\r
   IN       EFI_PEI_FILE_HANDLE  FileHandle,\r
   IN CONST EFI_PEI_SERVICES     **PeiServices\r