public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure
@ 2017-03-16  1:25 Dandan Bi
  2017-03-16  5:08 ` Jordan Justen
  0 siblings, 1 reply; 3+ messages in thread
From: Dandan Bi @ 2017-03-16  1:25 UTC (permalink / raw)
  To: edk2-devel; +Cc: Jordan Justen, Laszlo Ersek

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>
---
 OvmfPkg/Include/Library/QemuFwCfgS3Lib.h            | 10 +++++-----
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c    |  3 ++-
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c |  8 ++++----
 OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c     | 10 +++++-----
 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 76c8554..432e3c9 100644
--- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
@@ -153,12 +153,12 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
                                    QemuFwCfgS3CallWhenBootScriptReady() cannot
                                    be rolled back.
 
   @return                          Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID                                 *Context,          OPTIONAL
   IN     UINTN                                ScratchBufferSize
   );
@@ -202,12 +202,12 @@ QemuFwCfgS3CallWhenBootScriptReady (
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptWriteBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -249,12 +249,12 @@ QemuFwCfgS3ScriptWriteBytes (
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptReadBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -289,12 +289,12 @@ QemuFwCfgS3ScriptReadBytes (
 
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is too large.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptSkipBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   );
 
@@ -347,12 +347,12 @@ QemuFwCfgS3ScriptSkipBytes (
                                     wholly contained in the ScratchBufferSize
                                     bytes at ScratchBuffer.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptCheckValue (
   IN VOID   *ScratchData,
   IN UINT8  ValueSize,
   IN UINT64 ValueMask,
   IN UINT64 Value
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
index 7b71305..7fa1200 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
@@ -95,12 +95,13 @@ QemuFwCfgS3Enabled (
                                    QemuFwCfgS3CallWhenBootScriptReady() cannot
                                    be rolled back.
 
   @return                          Error codes from underlying functions.
 **/
-EFIAPI
+
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID                                 *Context,          OPTIONAL
   IN     UINTN                                ScratchBufferSize
   )
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
index 674929e..bdad448 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3BasePei.c
@@ -54,12 +54,12 @@
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptWriteBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -105,12 +105,12 @@ QemuFwCfgS3ScriptWriteBytes (
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptReadBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -149,12 +149,12 @@ QemuFwCfgS3ScriptReadBytes (
 
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is too large.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptSkipBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -211,12 +211,12 @@ QemuFwCfgS3ScriptSkipBytes (
                                     wholly contained in the ScratchBufferSize
                                     bytes at ScratchBuffer.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptCheckValue (
   IN VOID   *ScratchData,
   IN UINT8  ValueSize,
   IN UINT64 ValueMask,
   IN UINT64 Value
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
index 0bd6cf9..3fef2e3 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
@@ -137,12 +137,12 @@ S3SaveStateInstalledNotify (
                                    QemuFwCfgS3CallWhenBootScriptReady() cannot
                                    be rolled back.
 
   @return                          Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID                                 *Context,          OPTIONAL
   IN     UINTN                                ScratchBufferSize
   )
@@ -278,12 +278,12 @@ FreeDmaAccess:
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptWriteBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -426,12 +426,12 @@ QemuFwCfgS3ScriptWriteBytes (
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is larger than
                                     ScratchBufferSize.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptReadBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -564,12 +564,12 @@ QemuFwCfgS3ScriptReadBytes (
 
   @retval RETURN_BAD_BUFFER_SIZE    NumberOfBytes is too large.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptSkipBytes (
   IN INT32 FirmwareConfigItem,
   IN UINTN NumberOfBytes
   )
 {
@@ -714,12 +714,12 @@ QemuFwCfgS3ScriptSkipBytes (
                                     wholly contained in the ScratchBufferSize
                                     bytes at ScratchBuffer.
 
   @return                           Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3ScriptCheckValue (
   IN VOID   *ScratchData,
   IN UINT8  ValueSize,
   IN UINT64 ValueMask,
   IN UINT64 Value
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
index d447e36..031e9f2 100644
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
@@ -72,12 +72,12 @@
                                    QemuFwCfgS3CallWhenBootScriptReady() cannot
                                    be rolled back.
 
   @return                          Error codes from underlying functions.
 **/
-EFIAPI
 RETURN_STATUS
+EFIAPI
 QemuFwCfgS3CallWhenBootScriptReady (
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
   IN OUT VOID                                 *Context,          OPTIONAL
   IN     UINTN                                ScratchBufferSize
   )
-- 
1.9.5.msysgit.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-03-16 11:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-16  1:25 [patch] OvmfPkg/QemuFwCfgS3Lib: Fix VS tool chain build failure Dandan Bi
2017-03-16  5:08 ` Jordan Justen
2017-03-16 11:40   ` Laszlo Ersek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox