1) Replace IA32API with EFIAPI to standardise the calling convention.

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

diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
index 2b7d0a6999993b0c0fedb9c000d1bc8c8422ed0d..b3745ddf55d7779f78992e678d62d8e9b0f79227 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
+++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h
@@ -22,8 +22,6 @@ Abstract:
 \r
 #include "Tiano.h"\r
 \r
-#define IA32API __cdecl\r
-\r
 typedef struct {\r
   UINT32  RegEax;\r
   UINT32  RegEbx;\r
@@ -139,7 +137,7 @@ typedef struct {
   (((UINT32) (f) << 16) | ((UINT32) (m) << 8) | ((UINT32) (s)))\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiHalt (\r
   VOID\r
   );\r
@@ -153,7 +151,7 @@ Returns:
    None                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiWbinvd (\r
   VOID\r
   );\r
@@ -167,7 +165,7 @@ Returns:
    None                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiInvd (\r
   VOID\r
   );\r
@@ -181,7 +179,7 @@ Returns:
    None                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiCpuid (\r
   IN  UINT32                 RegisterInEax,\r
   OUT EFI_CPUID_REGISTER     *Regs\r
@@ -198,7 +196,7 @@ Returns:
 --*/\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiCpuidExt (\r
   IN  UINT32                 RegisterInEax,\r
   IN  UINT32                 CacheLevel,\r
@@ -219,7 +217,7 @@ Returns:
 ;\r
 \r
 UINT64\r
-IA32API\r
+EFIAPI\r
 EfiReadMsr (\r
   IN UINT32     Index\r
   );\r
@@ -234,7 +232,7 @@ Returns:
    Return the read data                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiWriteMsr (\r
   IN UINT32     Index,\r
   IN UINT64     Value\r
@@ -250,7 +248,7 @@ Returns:
    None                                                \r
 --*/\r
 UINT64\r
-IA32API\r
+EFIAPI\r
 EfiReadTsc (\r
   VOID\r
   );\r
@@ -264,7 +262,7 @@ Returns:
    Return the read data                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiDisableCache (\r
   VOID\r
   );\r
@@ -278,7 +276,7 @@ Returns:
   None                                               \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiEnableCache (\r
   VOID\r
   );\r
@@ -292,7 +290,7 @@ Returns:
   None                                               \r
 --*/\r
 UINT32\r
-IA32API\r
+EFIAPI\r
 EfiGetEflags (\r
   VOID\r
   );\r
@@ -306,7 +304,7 @@ Returns:
   Return the Eflags value                                               \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiDisableInterrupts (\r
   VOID\r
   );\r
@@ -320,7 +318,7 @@ Returns:
   None\r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiEnableInterrupts (\r
   VOID\r
   );\r
@@ -336,7 +334,7 @@ Returns:
 \r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 EfiCpuVersion (\r
   IN   UINT16  *FamilyId,    OPTIONAL\r
   IN   UINT8   *Model,       OPTIONAL\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
index df247522f61ab92c4d9e85809838fb1b12ea8a0f..76c93b28ae61c90e52b65b1fa5efc5f6338b7b61 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c
@@ -23,13 +23,11 @@ Abstract:
 #include "Thunk16Lib.h"\r
 #include "EfiCommonLib.h"\r
 \r
-#define IA32API EFIAPI\r
-\r
 extern CONST UINTN                  mCode16Size;\r
 \r
 extern\r
 IA32_REGISTER_SET *\r
-IA32API\r
+EFIAPI\r
 _Thunk16 (\r
   IN OUT  IA32_REGISTER_SET         *RegisterSet,\r
   IN      UINT32                    ThunkFlags,\r
@@ -38,19 +36,19 @@ _Thunk16 (
 \r
 extern\r
 VOID\r
-IA32API\r
+EFIAPI\r
 _Code16Addr (\r
   VOID\r
   );\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 AsmFxRestore (\r
   IN CONST IA32_FX_BUFFER *Buffer\r
   );\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 AsmFxSave (\r
   OUT IA32_FX_BUFFER *Buffer\r
   );\r