diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-02-11 05:50:37 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-02-11 05:50:37 +0000 |
| commit | 3dcc31296cf71b66f287fc06acd9126f62c6adca (patch) | |
| tree | 69ed52dd63a86eaa4b381f4812d717e667451649 | |
| parent | 5614b5d8a58b90921ef318a50b285d3567119530 (diff) | |
1) Replace IA32API with EFIAPI to standardise the calling convention.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk@7499 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | edk2/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h | 30 | ||||
| -rw-r--r-- | edk2/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c | 10 |
2 files changed, 18 insertions, 22 deletions
diff --git a/edk2/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h b/edk2/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h index 2b7d0a699..b3745ddf5 100644 --- a/edk2/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h +++ b/edk2/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h @@ -22,8 +22,6 @@ Abstract: #include "Tiano.h"
-#define IA32API __cdecl
-
typedef struct {
UINT32 RegEax;
UINT32 RegEbx;
@@ -139,7 +137,7 @@ typedef struct { (((UINT32) (f) << 16) | ((UINT32) (m) << 8) | ((UINT32) (s)))
VOID
-IA32API
+EFIAPI
EfiHalt (
VOID
);
@@ -153,7 +151,7 @@ Returns: None
--*/
VOID
-IA32API
+EFIAPI
EfiWbinvd (
VOID
);
@@ -167,7 +165,7 @@ Returns: None
--*/
VOID
-IA32API
+EFIAPI
EfiInvd (
VOID
);
@@ -181,7 +179,7 @@ Returns: None
--*/
VOID
-IA32API
+EFIAPI
EfiCpuid (
IN UINT32 RegisterInEax,
OUT EFI_CPUID_REGISTER *Regs
@@ -198,7 +196,7 @@ Returns: --*/
VOID
-IA32API
+EFIAPI
EfiCpuidExt (
IN UINT32 RegisterInEax,
IN UINT32 CacheLevel,
@@ -219,7 +217,7 @@ Returns: ;
UINT64
-IA32API
+EFIAPI
EfiReadMsr (
IN UINT32 Index
);
@@ -234,7 +232,7 @@ Returns: Return the read data
--*/
VOID
-IA32API
+EFIAPI
EfiWriteMsr (
IN UINT32 Index,
IN UINT64 Value
@@ -250,7 +248,7 @@ Returns: None
--*/
UINT64
-IA32API
+EFIAPI
EfiReadTsc (
VOID
);
@@ -264,7 +262,7 @@ Returns: Return the read data
--*/
VOID
-IA32API
+EFIAPI
EfiDisableCache (
VOID
);
@@ -278,7 +276,7 @@ Returns: None
--*/
VOID
-IA32API
+EFIAPI
EfiEnableCache (
VOID
);
@@ -292,7 +290,7 @@ Returns: None
--*/
UINT32
-IA32API
+EFIAPI
EfiGetEflags (
VOID
);
@@ -306,7 +304,7 @@ Returns: Return the Eflags value
--*/
VOID
-IA32API
+EFIAPI
EfiDisableInterrupts (
VOID
);
@@ -320,7 +318,7 @@ Returns: None
--*/
VOID
-IA32API
+EFIAPI
EfiEnableInterrupts (
VOID
);
@@ -336,7 +334,7 @@ Returns: VOID
-IA32API
+EFIAPI
EfiCpuVersion (
IN UINT16 *FamilyId, OPTIONAL
IN UINT8 *Model, OPTIONAL
diff --git a/edk2/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c b/edk2/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c index df247522f..76c93b28a 100644 --- a/edk2/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c +++ b/edk2/EdkCompatibilityPkg/Foundation/Library/Thunk16/X86Thunk.c @@ -23,13 +23,11 @@ Abstract: #include "Thunk16Lib.h"
#include "EfiCommonLib.h"
-#define IA32API EFIAPI
-
extern CONST UINTN mCode16Size;
extern
IA32_REGISTER_SET *
-IA32API
+EFIAPI
_Thunk16 (
IN OUT IA32_REGISTER_SET *RegisterSet,
IN UINT32 ThunkFlags,
@@ -38,19 +36,19 @@ _Thunk16 ( extern
VOID
-IA32API
+EFIAPI
_Code16Addr (
VOID
);
VOID
-IA32API
+EFIAPI
AsmFxRestore (
IN CONST IA32_FX_BUFFER *Buffer
);
VOID
-IA32API
+EFIAPI
AsmFxSave (
OUT IA32_FX_BUFFER *Buffer
);
|