ShellPkg/UefiShellDriver1CommandsLib: Remove unnecessary EFIAPI

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
index dd3d4a6a27340decd40ba81401ce273dc43c66c0..dd868a7016af2287a743e015b196edf4e191c647 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Connect.c
@@ -113,7 +113,6 @@ ShellConnectPciRootBridge (
   @retval EFI_SUCCESS             The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS             The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ConnectControllers (\r
   IN CONST EFI_HANDLE ControllerHandle OPTIONAL,\r
   IN CONST EFI_HANDLE DriverHandle OPTIONAL,\r
 ConnectControllers (\r
   IN CONST EFI_HANDLE ControllerHandle OPTIONAL,\r
   IN CONST EFI_HANDLE DriverHandle OPTIONAL,\r


@@ -194,7 +193,6 @@ ConnectControllers (
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ShellConnectFromDevPaths (\r
   IN CONST CHAR16 *Key\r
   )\r
 ShellConnectFromDevPaths (\r
   IN CONST CHAR16 *Key\r
   )\r


@@ -353,7 +351,6 @@ ShellConnectFromDevPaths (
   @retval EFI_SUCCESS           The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS           The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ConvertAndConnectControllers (\r
   IN EFI_HANDLE     *Handle1 OPTIONAL,\r
   IN EFI_HANDLE     *Handle2 OPTIONAL,\r
 ConvertAndConnectControllers (\r
   IN EFI_HANDLE     *Handle1 OPTIONAL,\r
   IN EFI_HANDLE     *Handle2 OPTIONAL,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
index 237cb85f94b7500809b3fa466a15490a326cb378..6f070eeaa1fd4aec87bf6aaa86f979e58ff28f7c 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DevTree.c
@@ -34,7 +34,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 DoDevTreeForHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Lang OPTIONAL,\r
 DoDevTreeForHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Lang OPTIONAL,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
index d229b352c8cb558115d371b31ae63c7bf253951c..b725178ebd151cf4e43e589320a3a710c3b45acc 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Devices.c
@@ -42,7 +42,6 @@
   @retval EFI_INVALID_PARAMETER A parameter was invalid.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER A parameter was invalid.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 GetDeviceHandleInfo (\r
   IN EFI_HANDLE   TheHandle,\r
   IN OUT CHAR16   *Type,\r
 GetDeviceHandleInfo (\r
   IN EFI_HANDLE   TheHandle,\r
   IN OUT CHAR16   *Type,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
index 0a1b9a920670c02b9a420d00fa235761099e5f0e..00a4c10edc24b0cc0d6715b74e3bf8381e5b18cd 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
@@ -53,7 +53,6 @@ STATIC CONST EFI_GUID *UefiDriverModelProtocolsGuidArray[] = {
   @retval EFI_SUCCESS     The name was found.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS     The name was found.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 GetDriverName (\r
   IN EFI_HANDLE   TheHandle,\r
   IN CONST CHAR8  *Language,\r
 GetDriverName (\r
   IN EFI_HANDLE   TheHandle,\r
   IN CONST CHAR8  *Language,\r


@@ -107,7 +106,6 @@ GetDriverName (
   @retval FALSE     The guid does not represent a driver model protocol.\r
 **/\r
 BOOLEAN\r
   @retval FALSE     The guid does not represent a driver model protocol.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 IsDriverProt (\r
   IN CONST EFI_GUID *Guid\r
   )\r
 IsDriverProt (\r
   IN CONST EFI_GUID *Guid\r
   )\r


@@ -140,7 +138,6 @@ IsDriverProt (
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 CHAR16*\r
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 CHAR16*\r

-EFIAPI\r

 GetProtocolInfoString(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Language,\r
 GetProtocolInfoString(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST CHAR8      *Language,\r


@@ -217,7 +214,6 @@ GetProtocolInfoString(
   @retval EFI_SUCCESS     The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS     The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 GetDriverImageName (\r
   IN EFI_HANDLE   TheHandle,\r
   OUT CHAR16      **Name\r
 GetDriverImageName (\r
   IN EFI_HANDLE   TheHandle,\r
   OUT CHAR16      **Name\r


@@ -256,7 +252,6 @@ GetDriverImageName (
   @param[in] Language   The language to output in.\r
 **/\r
 EFI_STATUS\r
   @param[in] Language   The language to output in.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DisplayDriverModelHandle (\r
   IN EFI_HANDLE  Handle,\r
   IN BOOLEAN     BestName,\r
 DisplayDriverModelHandle (\r
   IN EFI_HANDLE  Handle,\r
   IN BOOLEAN     BestName,\r


@@ -648,7 +643,6 @@ DisplayDriverModelHandle (
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 DoDhByHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST BOOLEAN    Verbose,\r
 DoDhByHandle(\r
   IN CONST EFI_HANDLE TheHandle,\r
   IN CONST BOOLEAN    Verbose,\r


@@ -729,7 +723,6 @@ DoDhByHandle(
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 DoDhForHandleList(\r
   IN CONST EFI_HANDLE *HandleList,\r
   IN CONST BOOLEAN    Verbose,\r
 DoDhForHandleList(\r
   IN CONST EFI_HANDLE *HandleList,\r
   IN CONST BOOLEAN    Verbose,\r


@@ -772,7 +765,6 @@ DoDhForHandleList(
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 DoDhForAll(\r
   IN CONST BOOLEAN  Sfo,\r
   IN CONST BOOLEAN  Verbose,\r
 DoDhForAll(\r
   IN CONST BOOLEAN  Sfo,\r
   IN CONST BOOLEAN  Verbose,\r


@@ -810,7 +802,6 @@ DoDhForAll(
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 DoDhByProtocol(\r
   IN CONST CHAR16   *ProtocolName,\r
   IN CONST BOOLEAN  Verbose,\r
 DoDhByProtocol(\r
   IN CONST CHAR16   *ProtocolName,\r
   IN CONST BOOLEAN  Verbose,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
index adca80ed6190a66255d66e5c99f239a32c3f3a65..1fd7b196e673247cbac6f98b7bea0e5d0e7d4154 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Disconnect.c
@@ -28,7 +28,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
   @retval EFI_SUCCESS     The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS     The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DisconnectAll(\r
   VOID\r
   )\r
 DisconnectAll(\r
   VOID\r
   )\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
index d6d75f06250cf30acc543ff04764784d0ff4ff50..ffdef043529f4b08d7353cc4bd21ff2aeac45eb7 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Drivers.c
@@ -33,7 +33,6 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
                   free this memory.\r
 **/\r
 CHAR16*\r
                   free this memory.\r
 **/\r
 CHAR16*\r

-EFIAPI\r

 GetDevicePathTextForHandle(\r
   IN EFI_HANDLE TheHandle\r
   )\r
 GetDevicePathTextForHandle(\r
   IN EFI_HANDLE TheHandle\r
   )\r


@@ -98,7 +97,6 @@ GetDevicePathTextForHandle(
   @retval FALSE             The driver does not have Driver Configuration.\r
 **/\r
 BOOLEAN\r
   @retval FALSE             The driver does not have Driver Configuration.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 ReturnDriverConfig(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
 ReturnDriverConfig(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r


@@ -120,7 +118,6 @@ ReturnDriverConfig(
   @retval FALSE             The driver does not have Driver Diagnostics.\r
 **/\r
 BOOLEAN\r
   @retval FALSE             The driver does not have Driver Diagnostics.\r
 **/\r
 BOOLEAN\r

-EFIAPI\r

 ReturnDriverDiag(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
 ReturnDriverDiag(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r


@@ -145,7 +142,6 @@ ReturnDriverDiag(
   @retval 0xFFFFFFFF  An error ocurred.\r
 **/\r
 UINT32\r
   @retval 0xFFFFFFFF  An error ocurred.\r
 **/\r
 UINT32\r

-EFIAPI\r

 ReturnDriverVersion(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
 ReturnDriverVersion(\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
index cc1c9ca188a99ac307114c17da56b447acbceab5..37501d4d3fdcfb5d0abc9864750861e52e1273d1 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvCfg.c
@@ -30,7 +30,6 @@ STATIC CONST EFI_GUID *CfgGuidList[] = {&gEfiDriverConfigurationProtocolGuid, &g
   @retval EFI_NOT_FOUND   There was no EFI_HII_HANDLE found for that deviec path.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND   There was no EFI_HII_HANDLE found for that deviec path.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 FindHiiHandleViaDevPath(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,\r
   OUT EFI_HII_HANDLE                *HiiHandle,\r
 FindHiiHandleViaDevPath(\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath1,\r
   OUT EFI_HII_HANDLE                *HiiHandle,\r


@@ -124,7 +123,6 @@ FindHiiHandleViaDevPath(
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ConvertHandleToHiiHandle(\r
   IN CONST EFI_HANDLE           Handle,\r
   OUT EFI_HII_HANDLE            *HiiHandle,\r
 ConvertHandleToHiiHandle(\r
   IN CONST EFI_HANDLE           Handle,\r
   OUT EFI_HII_HANDLE            *HiiHandle,\r


@@ -159,7 +157,6 @@ ConvertHandleToHiiHandle(
   @param[in] FileName         The filename to rwite the info to.\r
 **/\r
 SHELL_STATUS\r
   @param[in] FileName         The filename to rwite the info to.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 ConfigToFile(\r
   IN CONST EFI_HANDLE     Handle,\r
   IN CONST CHAR16         *FileName\r
 ConfigToFile(\r
   IN CONST EFI_HANDLE     Handle,\r
   IN CONST CHAR16         *FileName\r


@@ -269,7 +266,6 @@ ConfigToFile(
   @param[in] FileName         The filename to read the info from.\r
 **/\r
 SHELL_STATUS\r
   @param[in] FileName         The filename to read the info from.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 ConfigFromFile(\r
   IN       EFI_HANDLE     Handle,\r
   IN CONST CHAR16         *FileName\r
 ConfigFromFile(\r
   IN       EFI_HANDLE     Handle,\r
   IN CONST CHAR16         *FileName\r


@@ -486,7 +482,6 @@ ConfigFromFile(
   @retval SHELL_INVALID_PARAMETER   A parameter has a invalid value.\r
 **/\r
 EFI_STATUS\r
   @retval SHELL_INVALID_PARAMETER   A parameter has a invalid value.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ShellCmdDriverConfigurationProcessActionRequired (\r
   EFI_HANDLE                                DriverImageHandle,\r
   EFI_HANDLE                                ControllerHandle,\r
 ShellCmdDriverConfigurationProcessActionRequired (\r
   EFI_HANDLE                                DriverImageHandle,\r
   EFI_HANDLE                                ControllerHandle,\r


@@ -554,7 +549,6 @@ ShellCmdDriverConfigurationProcessActionRequired (
   @retval SHELL_INVALID_PARAMETER   A parameter has a invalid value.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_INVALID_PARAMETER   A parameter has a invalid value.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 PreHiiDrvCfg (\r
   IN CONST CHAR8    *Language,\r
   IN BOOLEAN        ForceDefaults,\r
 PreHiiDrvCfg (\r
   IN CONST CHAR8    *Language,\r
   IN BOOLEAN        ForceDefaults,\r


@@ -1062,7 +1056,6 @@ Done:
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r
   @retval SHELL_SUCCESS     The operation was successful.\r
 **/\r
 SHELL_STATUS\r

-EFIAPI\r

 PrintConfigInfoOnAll(\r
   IN CONST BOOLEAN ChildrenToo,\r
   IN CONST CHAR8   *Language,\r
 PrintConfigInfoOnAll(\r
   IN CONST BOOLEAN ChildrenToo,\r
   IN CONST CHAR8   *Language,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
index 04f6a58c3d98d7ea7f8ec56a9463a8eaf70aa506..cc1099f68f0e055ef22e0f421c3fdd259f9c0345 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/DrvDiag.c
@@ -42,7 +42,6 @@ typedef enum {
   @retval EFI_NOT_FOUND         No diagnostic handle could be found.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_NOT_FOUND         No diagnostic handle could be found.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DoDiagnostics (\r
   IN CONST DRV_DIAG_TEST_MODE Mode,\r
   IN CONST CHAR8              *Lang,\r
 DoDiagnostics (\r
   IN CONST DRV_DIAG_TEST_MODE Mode,\r
   IN CONST CHAR8              *Lang,\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
index e11873aa10fb61a1f5fe98029cb7dfe9b750ab1b..2a1748c514da96f69227fb77d5693c9cfd120ce1 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/OpenInfo.c
@@ -33,7 +33,6 @@ STATIC CONST CHAR16 StringUnknown[]   = L"Unknown  ";
   @retval EFI_INVALID_PARAMETER TheHandle was NULL.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER TheHandle was NULL.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 TraverseHandleDatabase (\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r
 TraverseHandleDatabase (\r
   IN CONST EFI_HANDLE TheHandle\r
   )\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
index c65d0ed69597b38a1f91c2f5e51706234b5cf8c4..7d1a601d7593c6258c626ba9f320406d363904e4 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.h
@@ -215,7 +215,6 @@ ShellCommandRunUnload (
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r
   @retval EFI_SUCCESS   The operation was successful.\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 ShellConnectFromDevPaths (\r
   IN CONST CHAR16 *Key\r
   );\r
 ShellConnectFromDevPaths (\r
   IN CONST CHAR16 *Key\r
   );\r

diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
index 0d48f9d5d7546e7d14b440b62afd1825b2673202..b5f085a750eb56e04754c0db6b51dd23c9b8d23e 100644 (file)
--- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
+++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Unload.c
@@ -24,7 +24,6 @@
   @retval EFI_INVALID_PARAMETER     The handle did not have LoadedImage\r
 **/\r
 EFI_STATUS\r
   @retval EFI_INVALID_PARAMETER     The handle did not have LoadedImage\r
 **/\r
 EFI_STATUS\r

-EFIAPI\r

 DumpLoadedImageProtocolInfo (\r
   IN EFI_HANDLE   TheHandle\r
   )\r
 DumpLoadedImageProtocolInfo (\r
   IN EFI_HANDLE   TheHandle\r
   )\r