Add return status check to fix GCC build failure below. error: right-hand operand of comma expression has no effect [-Werror=unused-value] #define _PCD_SET_MODE_BOOL_S_PcdSerialUseMmio(Value) ((_gPcd_BinaryPatch_PcdSerialUseMmio = (Value)), RETURN_SUCCESS)
error: right-hand operand of comma expression has no effect [-Werror=unused-value] #define _PCD_SET_MODE_64_S_PcdSerialRegisterBase(Value) ((_gPcd_BinaryPatch_PcdSerialRegisterBase = (Value)), RETURN_SUCCESS) http://article.gmane.org/gmane.comp.bios.edk2.devel/4949 Cc: Maurice Ma <[email protected]> Cc: Prince Agyeman <[email protected]> Cc: Laszlo Ersek <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Suggested-by: Laszlo Ersek <[email protected]> Signed-off-by: Star Zeng <[email protected]> --- CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c index 10fd332..8449997 100644 --- a/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c +++ b/CorebootPayloadPkg/Library/PlatformHookLib/PlatformHookLib.c @@ -45,11 +45,17 @@ PlatformHookSerialPortInitialize ( } if (SerialRegAccessType == 2) { //MMIO - PcdSetBoolS (PcdSerialUseMmio, TRUE); + Status = PcdSetBoolS (PcdSerialUseMmio, TRUE); } else { //IO - PcdSetBoolS (PcdSerialUseMmio, FALSE); + Status = PcdSetBoolS (PcdSerialUseMmio, FALSE); + } + if (RETURN_ERROR (Status)) { + return Status; + } + Status = PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase); + if (RETURN_ERROR (Status)) { + return Status; } - PcdSet64S (PcdSerialRegisterBase, (UINT64) SerialRegBase); return RETURN_SUCCESS; } -- 1.9.5.msysgit.0 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
