Use the correct ASSERT form.

[mirror_edk2.git] / Nt32Pkg / Library / EdkGenericBdsLib / BdsMisc.c

diff --git a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index dc53a678bd8869ab3f2cb4c3f1c909e5d07b2651..7eac6a012ee8782bf72316b9bfbbea5a999ead12 100644 (file)
--- a/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/Nt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -19,15 +19,13 @@ Abstract:
 \r
 --*/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <EdkGenericBdsLibInternal.h>\r
+\r
 \r
 #define MAX_STRING_LEN        200\r
 static BOOLEAN   mFeaturerSwitch = TRUE;\r
 static BOOLEAN   mResetRequired  = FALSE;\r
-extern UINT16 gPlatformBootTimeOutDefault;\r
+\r
 \r
 UINT16\r
 BdsLibGetTimeout (\r
@@ -68,7 +66,7 @@ Returns:
   // present.\r
   // This code should be removed later.\r
   //\r
-  Timeout = gPlatformBootTimeOutDefault;\r
+  Timeout = PcdGet16 (PcdUefiVariableDefaultTimeout);\r
 \r
   //\r
   // Notes: Platform should set default variable if non exists on all error cases!!!\r
@@ -778,7 +776,7 @@ Returns:
 \r
 EFI_STATUS\r
 BdsLibOutputStrings (\r
-  IN EFI_SIMPLE_TEXT_OUT_PROTOCOL   *ConOut,\r
+  IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *ConOut,\r
   ...\r
   )\r
 /*++\r
@@ -1017,7 +1015,7 @@ Returns:
                       &Browser\r
                       );\r
 \r
-      ASSERT (Status != EFI_SUCCESS);\r
+      ASSERT_EFI_ERROR (Status);\r
 \r
       StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));\r
       ASSERT (StringBuffer1 != NULL);\r