diff options
| author | Dandan Bi <dandan.bi@intel.com> | 2017-03-16 09:25:52 +0800 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2017-03-15 21:18:40 -0700 |
| commit | 08bed3fbac47e32a6c715de35ae9e80f21d4508c (patch) | |
| tree | 4f9e8d7b6a539167c57394baf6b99fb3f097e828 /OvmfPkg | |
| parent | 491c91ee9db5aa2638eba55266c2bd58c0ed84d2 (diff) | |
| download | edk2-08bed3fbac47e32a6c715de35ae9e80f21d4508c.tar.gz edk2-08bed3fbac47e32a6c715de35ae9e80f21d4508c.tar.bz2 edk2-08bed3fbac47e32a6c715de35ae9e80f21d4508c.zip | |
OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/Include/Library/QemuFwCfgS3Lib.h | 10 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c | 3 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c | 8 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 10 | ||||
| -rw-r--r-- | OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c | 2 |
5 files changed, 17 insertions, 16 deletions
diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h index 76c8554cb7..432e3c906c 100644 --- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h +++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h @@ -155,8 +155,8 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3CallWhenBootScriptReady (
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context, OPTIONAL
@@ -204,8 +204,8 @@ QemuFwCfgS3CallWhenBootScriptReady ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptWriteBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -251,8 +251,8 @@ QemuFwCfgS3ScriptWriteBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptReadBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -291,8 +291,8 @@ QemuFwCfgS3ScriptReadBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptSkipBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -349,8 +349,8 @@ QemuFwCfgS3ScriptSkipBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptCheckValue (
IN VOID *ScratchData,
IN UINT8 ValueSize,
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c index 7b71305d12..7fa1200ee3 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c @@ -97,8 +97,9 @@ QemuFwCfgS3Enabled ( @return Error codes from underlying functions.
**/
-EFIAPI
+
RETURN_STATUS
+EFIAPI
QemuFwCfgS3CallWhenBootScriptReady (
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context, OPTIONAL
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c index 674929e9d5..bdad448016 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c @@ -56,8 +56,8 @@ @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptWriteBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -107,8 +107,8 @@ QemuFwCfgS3ScriptWriteBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptReadBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -151,8 +151,8 @@ QemuFwCfgS3ScriptReadBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptSkipBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -213,8 +213,8 @@ QemuFwCfgS3ScriptSkipBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptCheckValue (
IN VOID *ScratchData,
IN UINT8 ValueSize,
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c index 0bd6cf9399..3fef2e3017 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c @@ -139,8 +139,8 @@ S3SaveStateInstalledNotify ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3CallWhenBootScriptReady (
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context, OPTIONAL
@@ -280,8 +280,8 @@ FreeDmaAccess: @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptWriteBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -428,8 +428,8 @@ QemuFwCfgS3ScriptWriteBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptReadBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -566,8 +566,8 @@ QemuFwCfgS3ScriptReadBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptSkipBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
@@ -716,8 +716,8 @@ QemuFwCfgS3ScriptSkipBytes ( @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3ScriptCheckValue (
IN VOID *ScratchData,
IN UINT8 ValueSize,
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c index d447e36fc0..031e9f2f70 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c @@ -74,8 +74,8 @@ @return Error codes from underlying functions.
**/
-EFIAPI
RETURN_STATUS
+EFIAPI
QemuFwCfgS3CallWhenBootScriptReady (
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context, OPTIONAL
|