Remove some unnecessary #if/#ifdef from some header files.

[mirror_edk2.git] / MdePkg / Library / BaseDebugLibNull / DebugLib.c

diff --git a/MdePkg/Library/BaseDebugLibNull/DebugLib.c b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
index 1440f8f127f0c61eb44273b7e56901a3503e99f0..c14944b7be6136be8f7491e0db107c92ea81d15c 100644 (file)
--- a/MdePkg/Library/BaseDebugLibNull/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibNull/DebugLib.c
@@ -12,11 +12,6 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-//\r
-// Define the maximum debug and assert message length that this library supports \r
-//\r
-#define MAX_DEBUG_MESSAGE_LENGTH  0x100\r
-\r

 /**\r
 \r
   Prints a debug message to the debug output device if the specified error level is enabled.\r
 /**\r
 \r
   Prints a debug message to the debug output device if the specified error level is enabled.\r


@@ -34,25 +29,11 @@
 VOID\r
 EFIAPI\r
 DebugPrint (\r
 VOID\r
 EFIAPI\r
 DebugPrint (\r

-  IN  UINTN ErrorLevel,\r
-  IN  CHAR8 *Format,\r
+  IN  UINTN        ErrorLevel,\r
+  IN  CONST CHAR8  *Format,\r

   ...\r
   )\r
 {\r
   ...\r
   )\r
 {\r

-  CHAR8    Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-  VA_LIST  Marker;\r
-\r
-  //\r
-  // If Format is NULL, then ASSERT().\r
-  //\r
-  ASSERT (Format != NULL);\r
-\r
-  //\r
-  // Print the assert message to a buffer\r
-  //\r
-  VA_START (Marker, Format);\r
-  AsciiVSPrint (Buffer, sizeof (Buffer), Format, Marker);\r
-  VA_END (Marker);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -61,7 +42,7 @@ DebugPrint (
   Prints an assert message containing a filename, line number, and description.  \r
   This may be followed by a breakpoint or a dead loop.\r
 \r
   Prints an assert message containing a filename, line number, and description.  \r
   This may be followed by a breakpoint or a dead loop.\r
 \r

-  Print a message of the form \93ASSERT <FileName>(<LineNumber>): <Description>\n\94 \r
+  Print a message of the form "ASSERT <FileName>(<LineNumber>): <Description>\n" \r

   to the debug output device.  If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of \r
   PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if \r
   DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then \r
   to the debug output device.  If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of \r
   PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if \r
   DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then \r


@@ -70,9 +51,9 @@ DebugPrint (
   DebugAssert() must actively prevent recusrsion.  If DebugAssert() is called while\r
   processing another DebugAssert(), then DebugAssert() must return immediately.\r
 \r
   DebugAssert() must actively prevent recusrsion.  If DebugAssert() is called while\r
   processing another DebugAssert(), then DebugAssert() must return immediately.\r
 \r

-  If FileName is NULL, then a <FileName> string of \93(NULL) Filename\94 is printed.\r
+  If FileName is NULL, then a <FileName> string of "(NULL) Filename" is printed.\r

 \r
 \r

-  If Description is NULL, then a <Description> string of \93(NULL) Description\94 is printed.\r
+  If Description is NULL, then a <Description> string of "(NULL) Description" is printed.\r

 \r
   @param  FileName     Pointer to the name of the source file that generated the assert condition.\r
   @param  LineNumber   The line number in the source file that generated the assert condition\r
 \r
   @param  FileName     Pointer to the name of the source file that generated the assert condition.\r
   @param  LineNumber   The line number in the source file that generated the assert condition\r


@@ -82,26 +63,11 @@ DebugPrint (
 VOID\r
 EFIAPI\r
 DebugAssert (\r
 VOID\r
 EFIAPI\r
 DebugAssert (\r

-  IN CHAR8  *FileName,\r
-  IN INTN   LineNumber,\r
-  IN CHAR8  *Description\r
+  IN CONST CHAR8  *FileName,\r
+  IN UINTN        LineNumber,\r
+  IN CONST CHAR8  *Description\r

   )\r
 {\r
   )\r
 {\r

-  CHAR8  Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-\r
-  //\r
-  // Print the assert message to a buffer\r
-  //\r
-  AsciiSPrint (Buffer, sizeof (Buffer), "ASSERT %s(%d): %s\n", FileName, LineNumber, Description);\r
-\r
-  //\r
-  // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings\r
-  //\r
-  if ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED) != 0) {\r
-    CpuBreakpoint ();\r
-  } else if ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED) != 0) {\r
-    CpuDeadLoop ();\r
-  }\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -114,7 +80,7 @@ DebugAssert (
 \r
   If Buffer is NULL, then ASSERT().\r
 \r
 \r
   If Buffer is NULL, then ASSERT().\r
 \r

-  If Length is greater than (MAX_ADDRESS \96 Buffer + 1), then ASSERT(). \r
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). \r

 \r
   @param   Buffer  Pointer to the target buffer to fill with PcdDebugClearMemoryValue.\r
   @param   Length  Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r
 \r
   @param   Buffer  Pointer to the target buffer to fill with PcdDebugClearMemoryValue.\r
   @param   Length  Number of bytes in Buffer to fill with zeros PcdDebugClearMemoryValue. \r


@@ -129,15 +95,7 @@ DebugClearMemory (
   IN UINTN  Length\r
   )\r
 {\r
   IN UINTN  Length\r
   )\r
 {\r

-  //\r
-  // If Buffer is NULL, then ASSERT().\r
-  //\r
-  ASSERT (Buffer != NULL);\r
-\r
-  //\r
-  // SetMem() checks for the the ASSERT() condition on Length and returns Buffer\r
-  //\r
-  return SetMem (Buffer, Length, PcdGet8(PcdDebugClearMemoryValue));\r
+  return Buffer;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -158,7 +116,7 @@ DebugAssertEnabled (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
+  return FALSE;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -179,7 +137,7 @@ DebugPrintEnabled (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
+  return FALSE;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -200,7 +158,7 @@ DebugCodeEnabled (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
+  return FALSE;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -221,5 +179,5 @@ DebugClearMemoryEnabled (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
+  return FALSE;\r

 }\r
 }\r