ShellPkg: Fix EFIAPI usage inconsistencies

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

diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
index c269081988040a5483cf901dd2232435ebf38beb..91817ee291c9d209a898b637c0f1bbd4de1010d2 100644 (file)
--- a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
+++ b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.c
@@ -18,7 +18,9 @@
 #include <Library/ShellCEntryLib.h>\r
 #include <Library/SortLib.h>\r
 \r
-INTN Test(CONST VOID*b1, CONST VOID*b2)\r
+INTN\r
+EFIAPI\r
+Test(CONST VOID*b1, CONST VOID*b2)\r
 {\r
   if (*(INTN*)b1 == *(INTN*)b2) {\r
     return (0);\r

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
index 1209579f1dd4a52b0bd1e73328816245d3df8f10..64483c01c2a7bf1e867948f31c2703050b18fca8 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShell.h
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -341,7 +341,7 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS;
 **/\r
 typedef\r
 EFI_STATUS\r
-(*EFI_SHELL_GET_DEVICE_NAME) (\r
+(EFIAPI *EFI_SHELL_GET_DEVICE_NAME) (\r
   IN EFI_HANDLE                   DeviceHandle,\r
   IN EFI_SHELL_DEVICE_NAME_FLAGS  Flags,\r
   IN CHAR8                        *Language,\r

diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 3425e9e912beb65d4a171251d9f9086eb0f18cb3..64f504a258148b59391fb843bdda7c0a7d3614ba 100644 (file)
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -43,8 +43,8 @@ typedef struct {
 typedef struct {\r
   UINT8 Type;\r
   UINT8 SubType;\r
-  VOID (*SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);\r
-  INTN (*CompareFun) (EFI_DEVICE_PATH_PROTOCOL *, EFI_DEVICE_PATH_PROTOCOL *);\r
+  VOID (EFIAPI *SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);\r
+  INTN (EFIAPI *CompareFun) (EFI_DEVICE_PATH_PROTOCOL *, EFI_DEVICE_PATH_PROTOCOL *);\r
 } DEV_PATH_CONSIST_MAPPING_TABLE;\r
 \r
 \r
@@ -259,6 +259,7 @@ AppendCSDGuid (
 }\r
 \r
 INTN\r
+EFIAPI\r
 _DevPathCompareAcpi (\r
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath1,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath2\r
@@ -284,6 +285,7 @@ _DevPathCompareAcpi (
 }\r
 \r
 INTN\r
+EFIAPI\r
 _DevPathComparePci (\r
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath1,\r
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath2\r
@@ -1063,7 +1065,7 @@ GetDeviceConsistMappingInfo (
   IN EFI_DEVICE_PATH_PROTOCOL       *DevicePath\r
   )\r
 {\r
-  VOID (*SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);\r
+  VOID (EFIAPI *SerialFun) (EFI_DEVICE_PATH_PROTOCOL *, DEVICE_CONSIST_MAPPING_INFO *);\r
 \r
   UINTN Index;\r
 \r
@@ -1204,10 +1206,10 @@ ShellCommandConsistMappingUnInitialize (
 }\r
 \r
 /**\r
-  Create a consistent mapped name for the device specified by DevicePath \r
+  Create a consistent mapped name for the device specified by DevicePath\r
   based on the Table.\r
 \r
-  This must be called after ShellCommandConsistMappingInitialize() and \r
+  This must be called after ShellCommandConsistMappingInitialize() and\r
   before ShellCommandConsistMappingUnInitialize() is called.\r
 \r
   @param[in] DeviecPath   The pointer to the dev path for the device.\r

diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.c b/ShellPkg/Library/UefiSortLib/UefiSortLib.c
index efeaad8c767ea90d8b976f567336eca91d1fe80b..7cbff34cca11fb39dbb899d99a958005f1143824 100644 (file)
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.c
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.c
@@ -191,6 +191,7 @@ PerformQuickSort (
   @return > 0                   Buffer1 is greater than Buffer2\r
 **/\r
 INTN\r
+EFIAPI\r
 DevicePathCompare (\r
   IN  CONST VOID             *Buffer1,\r
   IN  CONST VOID             *Buffer2\r