MdeModulePkg: Use PcdSet##S to replace PcdSet##

PcdSet## has no error status returned, then the caller has no idea about whether the set operation is successful or not.
PcdSet##S were added to return error status and PcdSet## APIs were put in ifndef DISABLE_NEW_DEPRECATED_INTERFACES condition.
To adopt PcdSet##S and further code development with DISABLE_NEW_DEPRECATED_INTERFACES defined, we need to Replace PcdSet## usage with PcdSet##S.

Normally, DynamicDefault PCD set is expected to be success, but DynamicHii PCD set failure is a legal case.
So for DynamicDefault, we add assert when set failure. For DynamicHii, we add logic to handle it.

Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18603 6f19259b-4bc3-4df7-8a09-765794883524
(cherry picked from commit 377680ae64bd6f702bfac7c98e65f73019b7d285)

4 files changed, 34 insertions, 19 deletions

diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
index 8748ac0e05..9547c7eb5a 100644
--- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
+++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
@@ -810,8 +810,10 @@ BdsSetConsoleMode (
                   //

                   // Update text mode PCD.

                   //

-                  PcdSet32 (PcdConOutColumn, mSetupTextModeColumn);

-                  PcdSet32 (PcdConOutRow, mSetupTextModeRow);

+                  Status = PcdSet32S (PcdConOutColumn, mSetupTextModeColumn);

+                  ASSERT_EFI_ERROR (Status);

+                  Status = PcdSet32S (PcdConOutRow, mSetupTextModeRow);

+                  ASSERT_EFI_ERROR (Status);

                   FreePool (Info);

                   return EFI_SUCCESS;

                 }

@@ -852,11 +854,14 @@ BdsSetConsoleMode (
   // Set PCD to Inform GraphicsConsole to change video resolution.

   // Set PCD to Inform Consplitter to change text mode.

   //

-  PcdSet32 (PcdVideoHorizontalResolution, NewHorizontalResolution);

-  PcdSet32 (PcdVideoVerticalResolution, NewVerticalResolution);

-  PcdSet32 (PcdConOutColumn, NewColumns);

-  PcdSet32 (PcdConOutRow, NewRows);

-  

+  Status = PcdSet32S (PcdVideoHorizontalResolution, NewHorizontalResolution);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdVideoVerticalResolution, NewVerticalResolution);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdConOutColumn, NewColumns);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdConOutRow, NewRows);

+  ASSERT_EFI_ERROR (Status);

   

   //

   // Video mode is changed, so restart graphics console driver and higher level driver.

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
index 76dbd3a4a9..a8d9cd5efb 100644
--- a/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
+++ b/MdeModulePkg/Application/UiApp/BootMaint/Variable.c
@@ -1064,9 +1064,11 @@ Var_UpdateConMode (
 

   Status = gST->ConOut->QueryMode (gST->ConOut, Mode, &(ModeInfo.Column), &(ModeInfo.Row));

   if (!EFI_ERROR(Status)) {

-    PcdSet32 (PcdSetupConOutColumn, (UINT32) ModeInfo.Column);

-    PcdSet32 (PcdSetupConOutRow, (UINT32) ModeInfo.Row);

+    Status = PcdSet32S (PcdSetupConOutColumn, (UINT32) ModeInfo.Column);

+    if (!EFI_ERROR (Status)) {

+      Status = PcdSet32S (PcdSetupConOutRow, (UINT32) ModeInfo.Row);

+    }

   }

 

-  return EFI_SUCCESS;

+  return Status;

 }

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c
index d1b4f5cb6a..245c3497c8 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.c
+++ b/MdeModulePkg/Application/UiApp/FrontPage.c
@@ -989,8 +989,10 @@ BdsSetConsoleMode (
                   //

                   // Update text mode PCD.

                   //

-                  PcdSet32 (PcdConOutColumn, mSetupTextModeColumn);

-                  PcdSet32 (PcdConOutRow, mSetupTextModeRow);

+                  Status = PcdSet32S (PcdConOutColumn, mSetupTextModeColumn);

+                  ASSERT_EFI_ERROR (Status);

+                  Status = PcdSet32S (PcdConOutRow, mSetupTextModeRow);

+                  ASSERT_EFI_ERROR (Status);

                   FreePool (Info);

                   return EFI_SUCCESS;

                 }

@@ -1031,10 +1033,14 @@ BdsSetConsoleMode (
   // Set PCD to Inform GraphicsConsole to change video resolution.

   // Set PCD to Inform Consplitter to change text mode.

   //

-  PcdSet32 (PcdVideoHorizontalResolution, NewHorizontalResolution);

-  PcdSet32 (PcdVideoVerticalResolution, NewVerticalResolution);

-  PcdSet32 (PcdConOutColumn, NewColumns);

-  PcdSet32 (PcdConOutRow, NewRows);

+  Status = PcdSet32S (PcdVideoHorizontalResolution, NewHorizontalResolution);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdVideoVerticalResolution, NewVerticalResolution);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdConOutColumn, NewColumns);

+  ASSERT_EFI_ERROR (Status);

+  Status = PcdSet32S (PcdConOutRow, NewRows);

+  ASSERT_EFI_ERROR (Status);

   

   

   //

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index bea206d35b..dae97b09a2 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -16,7 +16,7 @@
   never removed. Such design ensures sytem function well during none console

   device situation.

 

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -2946,8 +2946,10 @@ ConsplitterSetConsoleOutMode (
     Status = TextOut->SetMode (TextOut, BaseMode);

     ASSERT(!EFI_ERROR(Status));

 

-    PcdSet32 (PcdConOutColumn, 80);

-    PcdSet32 (PcdConOutRow, 25);

+    Status = PcdSet32S (PcdConOutColumn, 80);

+    ASSERT(!EFI_ERROR(Status));

+    Status = PcdSet32S (PcdConOutRow, 25);

+    ASSERT(!EFI_ERROR(Status));

   }

 

   return ;