Remove 3 library instances: EdkDxeDebugLibReportStatusCode, EdkUefiDebugLibConOut...

1) EdkUefiDebugLibConOut, EdkUefiDebugLibStdErr should be replaced by respective library instance in MdePkg
2) We will have a replacement implementation for EdkDxeDebugLibReportStatusCode to emulate the EDK I implementation with a gEfiDebugMaskProtocolGuid which allows Developer to Set debug level using SHELL command err.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2550 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 2e362adc8f2f98d1640bfb6d27b7c5a5de84a3be..fe9b69630405f8c8ea790fbc059c4cbc5e388fc0 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -6,7 +6,7 @@
     <Version>0.3</Version>\r
     <Abstract>Edk Module Package Reference Implementations</Abstract>\r
     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
     <License>All rights reserved.
       This program and the accompanying materials are licensed and made available 
       under the terms and conditions of the BSD License which accompanies this distribution.
@@ -387,7 +387,6 @@
     <Filename>Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.msa</Filename>\r
     <Filename>Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.msa</Filename>\r
     <Filename>Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa</Filename>\r
-    <Filename>Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa</Filename>\r
     <Filename>Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.msa</Filename>\r
     <Filename>Library/DxePerformanceLib/DxePerformanceLib.msa</Filename>\r
     <Filename>Library/EdkDxePrintLib/EdkDxePrintLib.msa</Filename>\r
@@ -400,8 +399,6 @@
     <Filename>Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.msa</Filename>\r
     <Filename>Library/PeiPerformanceLib/PeiPerformanceLib.msa</Filename>\r
     <Filename>Library/EdkScsiLib/EdkScsiLib.msa</Filename>\r
-    <Filename>Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa</Filename>\r
-    <Filename>Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa</Filename>\r
     <Filename>Library/EdkUsbLib/EdkUsbLib.msa</Filename>\r
     <Filename>Library/EdkSerialPortLibNull/EdkSerialPortLibNull.msa</Filename>\r
     <Filename>Library/EdkOemHookStatusCodeLibNull/EdkOemHookStatusCodeLibNull.msa</Filename>\r

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/DebugLib.c b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/DebugLib.c
deleted file mode 100644 (file)
index 6bc2c20..0000000
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/DebugLib.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/** @file\r
-  EFI Debug Library that installs Debug Level Protocol.\r
-\r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/\r
-\r
-STATIC BOOLEAN                   mDebugLevelInstalled = FALSE;\r
-STATIC EFI_DEBUG_LEVEL_PROTOCOL  mDebugLevel = { 0 };\r
-\r
-/**\r
-  Installs Debug Level Protocol.\r
-  \r
-  The constructor function installs Debug Level Protocol on the ImageHandle.\r
-  It will ASSERT() if the installation fails and will always return EFI_SUCCESS. \r
-\r
-  @param  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param  SystemTable   A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-DebugLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS           Status;\r
-\r
-  //\r
-  // Initialize Debug Level Protocol.\r
-  //\r
-  mDebugLevel.DebugLevel = PcdGet32(PcdDebugPrintErrorLevel);\r
-\r
-  //\r
-  // Install Debug Level Protocol. \r
-  //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &ImageHandle,\r
-                  &gEfiDebugLevelProtocolGuid,\r
-                  &mDebugLevel,\r
-                  NULL\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Set flag to show that the Debug Level Protocol has been installed.\r
-  //\r
-  mDebugLevelInstalled = TRUE;\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-\r
-  Prints a debug message to the debug output device if the specified error level is enabled.\r
-\r
-  If any bit in ErrorLevel is also set in PcdDebugPrintErrorLevel, then print \r
-  the message specified by Format and the associated variable argument list to \r
-  the debug output device.\r
-\r
-  If Format is NULL, then ASSERT().\r
-\r
-  @param  ErrorLevel  The error level of the debug message.\r
-  @param  Format      Format string for the debug message to print.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugPrint (\r
-  IN  UINTN        ErrorLevel,\r
-  IN  CONST CHAR8  *Format,\r
-  ...\r
-  )\r
-{\r
-  UINT64          Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)];\r
-  EFI_DEBUG_INFO  *DebugInfo;\r
-  UINTN           TotalSize;\r
-  UINTN           Index;\r
-  VA_LIST         Marker;\r
-  UINT64          *ArgumentPointer;\r
-\r
-  //\r
-  // If Format is NULL, then ASSERT().\r
-  //\r
-  ASSERT (Format != NULL);\r
-\r
-  //\r
-  // Check driver Debug Level value and global debug level\r
-  //\r
-  if (mDebugLevelInstalled) {\r
-    if ((ErrorLevel & mDebugLevel.DebugLevel) == 0) {\r
-      return;\r
-    }\r
-  } else {\r
-    if ((ErrorLevel & PcdGet32(PcdDebugPrintErrorLevel)) == 0) {\r
-      return;\r
-    }\r
-  }\r
-\r
-  TotalSize = sizeof (EFI_DEBUG_INFO) + 12 * sizeof (UINT64) + AsciiStrLen (Format) + 1;\r
-  if (TotalSize > EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
-    return;\r
-  }\r
-\r
-  //\r
-  // Then EFI_DEBUG_INFO\r
-  //\r
-  DebugInfo = (EFI_DEBUG_INFO *)Buffer;\r
-  DebugInfo->ErrorLevel = (UINT32)ErrorLevel;\r
-\r
-  //\r
-  // 256 byte mini Var Arg stack. That is followed by the format string.\r
-  //\r
-  VA_START (Marker, Format);\r
-  for (Index = 0, ArgumentPointer = (UINT64 *)(DebugInfo + 1); Index < 12; Index++, ArgumentPointer++) {\r
-    WriteUnaligned64(ArgumentPointer, VA_ARG (Marker, UINT64));\r
-  }\r
-  VA_END (Marker);\r
-  AsciiStrCpy ((CHAR8 *)ArgumentPointer, Format);\r
-\r
-  REPORT_STATUS_CODE_EX (\r
-    EFI_DEBUG_CODE,\r
-    (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_DC_UNSPECIFIED),\r
-    0,\r
-    NULL,\r
-    &gEfiStatusCodeDataTypeDebugGuid,\r
-    DebugInfo,\r
-    TotalSize\r
-    );\r
-}\r
-\r
-\r
-/**\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 "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
-  CpuDeadLoop() is called.  If neither of these bits are set, then this function \r
-  returns immediately after the message is printed to the debug output device.\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 "(NULL) Filename" is printed.\r
-\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
-  @param  Description  Pointer to the description of the assert condition.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugAssert (\r
-  IN CONST CHAR8  *FileName,\r
-  IN UINTN        LineNumber,\r
-  IN CONST CHAR8  *Description\r
-  )\r
-{\r
-  UINT64                 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof(UINT64)];\r
-  EFI_DEBUG_ASSERT_DATA  *AssertData;\r
-  UINTN                  TotalSize;\r
-  CHAR8                  *Temp;\r
-\r
-  //\r
-  // Make sure it will all fit in the passed in buffer.\r
-  //\r
-  TotalSize = sizeof (EFI_DEBUG_ASSERT_DATA) + AsciiStrLen (FileName) + 1 + AsciiStrLen (Description) + 1;\r
-  if (TotalSize <= EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
-    //\r
-    // Fill in EFI_DEBUG_ASSERT_DATA\r
-    //\r
-    AssertData = (EFI_DEBUG_ASSERT_DATA *)Buffer;\r
-    AssertData->LineNumber = (UINT32)LineNumber;\r
-\r
-    //\r
-    // Copy Ascii FileName including NULL.\r
-    //\r
-    Temp = AsciiStrCpy ((CHAR8 *)(AssertData + 1), FileName);\r
-\r
-    //\r
-    // Copy Ascii Description. \r
-    //\r
-    AsciiStrCpy (Temp + AsciiStrLen (FileName) + 1, Description);\r
-\r
-    REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
-      (EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED),\r
-      (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_EC_ILLEGAL_SOFTWARE_STATE),\r
-      AssertData,\r
-      TotalSize\r
-      );\r
-  }\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
-  Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
-\r
-  This function fills Length bytes of Buffer with the value specified by \r
-  PcdDebugClearMemoryValue, and returns Buffer.\r
-\r
-  If Buffer is NULL, then ASSERT().\r
-\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
-  @return  Buffer\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-DebugClearMemory (\r
-  OUT VOID  *Buffer,\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
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if ASSERT() macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugAssertEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugPrintEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CODE()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugCodeEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CLEAR_MEMORY()macro is enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugClearMemoryEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
-}\r

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
deleted file mode 100644 (file)
index d15013b..0000000
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-  <MsaHeader>\r
-    <ModuleName>EdkDxeDebugLibReportStatusCode</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>76a2a4d8-f605-407a-8057-4a17dcdc4c6d</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Debug Library for DXE drivers</Abstract>\r
-    <Description>This library provides debug functions by laying on a Report Status Code Library.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>EdkDxeDebugLibReportStatusCode</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>ReportStatusCodeLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>DebugLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_PRODUCED">\r
-      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Guids>\r
-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>\r
-    </GuidCNames>\r
-  </Guids>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-    <Extern>\r
-      <Constructor>DebugLibConstructor</Constructor>\r
-    </Extern>\r
-  </Externs>\r
-  <PcdCoded>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>\r
-    </PcdEntry>\r
-  </PcdCoded>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/DebugLib.c b/EdkModulePkg/Library/EdkUefiDebugLibConOut/DebugLib.c
deleted file mode 100644 (file)
index 43d904a..0000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/DebugLib.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/** @file\r
-  UEFI Debug Library that uses PrintLib to send messages to CONOUT.\r
-\r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\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
-STATIC BOOLEAN                   mDebugLevelInstalled = FALSE;\r
-STATIC EFI_DEBUG_LEVEL_PROTOCOL  mDebugLevel = { 0 };\r
-\r
-/**\r
-  Installs Debug Level Protocol.\r
-  \r
-  The constructor function installs Debug Level Protocol on the ImageHandle.\r
-  It will ASSERT() if the installation fails and will always return EFI_SUCCESS. \r
-\r
-  @param  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param  SystemTable   A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-DebugLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS           Status;\r
-\r
-  //\r
-  // Initialize Debug Level Protocol.\r
-  //\r
-  mDebugLevel.DebugLevel = PcdGet32(PcdDebugPrintErrorLevel);\r
-\r
-  //\r
-  // Install Debug Level Protocol. \r
-  //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &ImageHandle,\r
-                  &gEfiDebugLevelProtocolGuid,\r
-                  &mDebugLevel,\r
-                  NULL\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Set flag to show that the Debug Level Protocol has been installed.\r
-  //\r
-  mDebugLevelInstalled = TRUE;\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-\r
-  Prints a debug message to the debug output device if the specified error level is enabled.\r
-\r
-  If any bit in ErrorLevel is also set in PcdDebugPrintErrorLevel, then print \r
-  the message specified by Format and the associated variable argument list to \r
-  the debug output device.\r
-\r
-  If Format is NULL, then ASSERT().\r
-\r
-  @param  ErrorLevel  The error level of the debug message.\r
-  @param  Format      Format string for the debug message to print.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugPrint (\r
-  IN  UINTN        ErrorLevel,\r
-  IN  CONST CHAR8  *Format,\r
-  ...\r
-  )\r
-{\r
-  CHAR16   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
-  // Check driver Debug Level value and global debug level\r
-  //\r
-  if (mDebugLevelInstalled) {\r
-    if ((ErrorLevel & mDebugLevel.DebugLevel) == 0) {\r
-      return;\r
-    }\r
-  } else {\r
-    if ((ErrorLevel & PcdGet32(PcdDebugPrintErrorLevel)) == 0) {\r
-      return;\r
-    }\r
-  }\r
-\r
-  //\r
-  // Convert the DEBUG() message to a Unicode String\r
-  //\r
-  VA_START (Marker, Format);\r
-  UnicodeVSPrintAsciiFormat (Buffer, sizeof (Buffer), Format, Marker);\r
-  VA_END (Marker);\r
-\r
-  //\r
-  // Send the print string to the Console Output device if CONOUT is available.\r
-  //\r
-  if (gST->ConOut != NULL) {\r
-    gST->ConOut->OutputString (gST->ConOut, Buffer);\r
-  }\r
-}\r
-\r
-\r
-/**\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 "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
-  CpuDeadLoop() is called.  If neither of these bits are set, then this function \r
-  returns immediately after the message is printed to the debug output device.\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 "(NULL) Filename" is printed.\r
-\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
-  @param  Description  Pointer to the description of the assert condition.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugAssert (\r
-  IN CONST CHAR8  *FileName,\r
-  IN UINTN        LineNumber,\r
-  IN CONST CHAR8  *Description\r
-  )\r
-{\r
-  CHAR16  Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-\r
-  //\r
-  // Generate the ASSERT() message in Unicode format\r
-  //\r
-  UnicodeSPrintAsciiFormat (Buffer, sizeof (Buffer), "ASSERT %s(%d): %s\n", FileName, LineNumber, Description);\r
-\r
-  //\r
-  // Send the print string to the Console Output device if CONOUT is available.\r
-  //\r
-  if (gST->ConOut != NULL) {\r
-    gST->ConOut->OutputString (gST->ConOut, Buffer);\r
-  }\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
-  Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
-\r
-  This function fills Length bytes of Buffer with the value specified by \r
-  PcdDebugClearMemoryValue, and returns Buffer.\r
-\r
-  If Buffer is NULL, then ASSERT().\r
-\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
-  @return  Buffer\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-DebugClearMemory (\r
-  OUT VOID  *Buffer,\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
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if ASSERT() macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugAssertEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugPrintEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CODE()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugCodeEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CLEAR_MEMORY()macro is enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugClearMemoryEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
-}\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
deleted file mode 100644 (file)
index 64f55e5..0000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-  <MsaHeader>\r
-    <ModuleName>EdkUefiDebugLibConOut</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>7293fe0b-1fff-4f8f-b808-10cb55f6a174</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Debug Library for UEFI drivers</Abstract>\r
-    <Description>This library uses PrintLib to send messages to CONOUT.</Description>\r
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>EdkUefiDebugLibConOut</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>DebugLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_PRODUCED">\r
-      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-    <Extern>\r
-      <Constructor>DebugLibConstructor</Constructor>\r
-    </Extern>\r
-  </Externs>\r
-  <PcdCoded>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r
-  </PcdCoded>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/DebugLib.c b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/DebugLib.c
deleted file mode 100644 (file)
index 9ba70df..0000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/DebugLib.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/** @file\r
-  UEFI Debug Library that uses PrintLib to send messages to STDERR.\r
-\r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\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
-STATIC BOOLEAN                   mDebugLevelInstalled = FALSE;\r
-STATIC EFI_DEBUG_LEVEL_PROTOCOL  mDebugLevel = { 0 };\r
-\r
-/**\r
-  Installs Debug Level Protocol.\r
-  \r
-  The constructor function installs Debug Level Protocol on the ImageHandle.\r
-  It will ASSERT() if the installation fails and will always return EFI_SUCCESS. \r
-\r
-  @param  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param  SystemTable   A pointer to the EFI System Table.\r
-  \r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-DebugLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS           Status;\r
-\r
-  //\r
-  // Initialize Debug Level Protocol.\r
-  //\r
-  mDebugLevel.DebugLevel = PcdGet32(PcdDebugPrintErrorLevel);\r
-\r
-  //\r
-  // Install Debug Level Protocol. \r
-  //\r
-  Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &ImageHandle,\r
-                  &gEfiDebugLevelProtocolGuid,\r
-                  &mDebugLevel,\r
-                  NULL\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  //\r
-  // Set flag to show that the Debug Level Protocol has been installed.\r
-  //\r
-  mDebugLevelInstalled = TRUE;\r
-\r
-  return Status;\r
-}\r
-\r
-/**\r
-\r
-  Prints a debug message to the debug output device if the specified error level is enabled.\r
-\r
-  If any bit in ErrorLevel is also set in PcdDebugPrintErrorLevel, then print \r
-  the message specified by Format and the associated variable argument list to \r
-  the debug output device.\r
-\r
-  If Format is NULL, then ASSERT().\r
-\r
-  @param  ErrorLevel  The error level of the debug message.\r
-  @param  Format      Format string for the debug message to print.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugPrint (\r
-  IN  UINTN        ErrorLevel,\r
-  IN  CONST CHAR8  *Format,\r
-  ...\r
-  )\r
-{\r
-  CHAR16   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
-  // Check driver Debug Level value and global debug level\r
-  //\r
-  if (mDebugLevelInstalled) {\r
-    if ((ErrorLevel & mDebugLevel.DebugLevel) == 0) {\r
-      return;\r
-    }\r
-  } else {\r
-    if ((ErrorLevel & PcdGet32(PcdDebugPrintErrorLevel)) == 0) {\r
-      return;\r
-    }\r
-  }\r
-\r
-  //\r
-  // Convert the DEBUG() message to a Unicode String\r
-  //\r
-  VA_START (Marker, Format);\r
-  UnicodeVSPrintAsciiFormat (Buffer, sizeof (Buffer), Format, Marker);\r
-  VA_END (Marker);\r
-\r
-  //\r
-  // Send the print string to the Standard Error device if STDERR is available.\r
-  //\r
-  if (gST->StdErr != NULL) {\r
-    gST->StdErr->OutputString (gST->StdErr, Buffer);\r
-  }\r
-}\r
-\r
-\r
-/**\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 "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
-  CpuDeadLoop() is called.  If neither of these bits are set, then this function \r
-  returns immediately after the message is printed to the debug output device.\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 "(NULL) Filename" is printed.\r
-\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
-  @param  Description  Pointer to the description of the assert condition.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-DebugAssert (\r
-  IN CONST CHAR8  *FileName,\r
-  IN UINTN        LineNumber,\r
-  IN CONST CHAR8  *Description\r
-  )\r
-{\r
-  CHAR16  Buffer[MAX_DEBUG_MESSAGE_LENGTH];\r
-\r
-  //\r
-  // Generate the ASSERT() message in Unicode format\r
-  //\r
-  UnicodeSPrintAsciiFormat (Buffer, sizeof (Buffer), "ASSERT %s(%d): %s\n", FileName, LineNumber, Description);\r
-\r
-  //\r
-  // Send the print string to the Standard Error device if STDERR is available.\r
-  //\r
-  if (gST->StdErr != NULL) {\r
-    gST->StdErr->OutputString (gST->StdErr, Buffer);\r
-  }\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
-  Fills a target buffer with PcdDebugClearMemoryValue, and returns the target buffer.\r
-\r
-  This function fills Length bytes of Buffer with the value specified by \r
-  PcdDebugClearMemoryValue, and returns Buffer.\r
-\r
-  If Buffer is NULL, then ASSERT().\r
-\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
-  @return  Buffer\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-DebugClearMemory (\r
-  OUT VOID  *Buffer,\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
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if ASSERT() macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugAssertEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugPrintEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CODE()macros are enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugCodeEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);\r
-}\r
-\r
-\r
-/**\r
-  \r
-  Returns TRUE if DEBUG_CLEAR_MEMORY()macro is enabled.\r
-\r
-  This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of \r
-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.\r
-\r
-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.\r
-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is clear.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-DebugClearMemoryEnabled (\r
-  VOID\r
-  )\r
-{\r
-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);\r
-}\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
deleted file mode 100644 (file)
index 31399be..0000000
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-  <MsaHeader>\r
-    <ModuleName>EdkUefiDebugLibStdErr</ModuleName>\r
-    <ModuleType>DXE_DRIVER</ModuleType>\r
-    <GuidValue>8b9968e0-c76b-4b57-aec4-24e17fe602c0</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Debug Library for UEFI drivers</Abstract>\r
-    <Description>This library uses PrintLib to send messages to STDERR.</Description>\r
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
-    <License>All rights reserved. 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
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>EdkUefiDebugLibConOut</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>UefiBootServicesTableLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>DebugLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-  </PackageDependencies>\r
-  <Protocols>\r
-    <Protocol Usage="ALWAYS_PRODUCED">\r
-      <ProtocolCName>gEfiDebugLevelProtocolGuid</ProtocolCName>\r
-    </Protocol>\r
-  </Protocols>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-    <Extern>\r
-      <Constructor>DebugLibConstructor</Constructor>\r
-    </Extern>\r
-  </Externs>\r
-  <PcdCoded>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r
-  </PcdCoded>\r
-</ModuleSurfaceArea>
\ No newline at end of file