Update all the code to consume the ConvertDevicePathToText, ConvertDevicePathNodeToText, ConvertTextToDevicePath and ConvertTextToDeviceNode APIs in DevicePathLib.

Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14505 6f19259b-4bc3-4df7-8a09-765794883524

7 files changed, 58 insertions, 1575 deletions

diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 781b415178..ba6af2caef 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,7 +1,7 @@
 /** @file

   Platform BDS customizations.

 

-  Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2004 - 2013, 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

@@ -209,14 +209,16 @@ Returns:
   // Print Device Path

   //

   DevPathStr = DevicePathToStr(DevicePath);

-  DEBUG((

-    EFI_D_INFO,

-    "BdsPlatform.c+%d: COM%d DevPath: %s\n",

-    __LINE__,

-    gPnp16550ComPortDeviceNode.UID + 1,

-    DevPathStr

-    ));

-  FreePool(DevPathStr);

+  if (DevPathStr != NULL) {

+    DEBUG((

+      EFI_D_INFO,

+      "BdsPlatform.c+%d: COM%d DevPath: %s\n",

+      __LINE__,

+      gPnp16550ComPortDeviceNode.UID + 1,

+      DevPathStr

+      ));

+    FreePool(DevPathStr);

+  }

 

   BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);

   BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);

@@ -236,14 +238,16 @@ Returns:
   // Print Device Path

   //

   DevPathStr = DevicePathToStr(DevicePath);

-  DEBUG((

-    EFI_D_INFO,

-    "BdsPlatform.c+%d: COM%d DevPath: %s\n",

-    __LINE__,

-    gPnp16550ComPortDeviceNode.UID + 1,

-    DevPathStr

-    ));

-  FreePool(DevPathStr);

+  if (DevPathStr != NULL) {

+    DEBUG((

+      EFI_D_INFO,

+      "BdsPlatform.c+%d: COM%d DevPath: %s\n",

+      __LINE__,

+      gPnp16550ComPortDeviceNode.UID + 1,

+      DevPathStr

+      ));

+    FreePool(DevPathStr);

+  }

 

   BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);

   BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);

@@ -799,12 +803,14 @@ ConnectRecursivelyIfPciMassStorage (
     // Print Device Path

     //

     DevPathStr = DevicePathToStr (DevicePath);

-    DEBUG((

-      EFI_D_INFO,

-      "Found Mass Storage device: %s\n",

-      DevPathStr

-      ));

-    FreePool(DevPathStr);

+    if (DevPathStr != NULL) {

+      DEBUG((

+        EFI_D_INFO,

+        "Found Mass Storage device: %s\n",

+        DevPathStr

+        ));

+      FreePool(DevPathStr);

+    }

 

     Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);

     if (EFI_ERROR (Status)) {

diff --git a/OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c b/OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c
index 9f94e2424a..c9b8556fab 100644
--- a/OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c
+++ b/OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c
@@ -1,7 +1,7 @@
 /** @file

   Rewrite the BootOrder NvVar based on QEMU's "bootorder" fw_cfg file.

 

-  Copyright (C) 2012, Red Hat, Inc.

+  Copyright (C) 2012 - 2013, Red Hat, Inc.

 

   This program and the accompanying materials are licensed and made available

   under the terms and conditions of the BSD License which accompanies this

@@ -20,7 +20,7 @@
 #include <Library/UefiRuntimeServicesTableLib.h>

 #include <Library/BaseLib.h>

 #include <Library/PrintLib.h>

-#include <Protocol/DevicePathToText.h>

+#include <Library/DevicePathLib.h>

 #include <Guid/GlobalVariable.h>

 

 

@@ -866,18 +866,17 @@ BOOLEAN
 Match (

   IN  CONST CHAR16                           *Translated,

   IN  UINTN                                  TranslatedLength,

-  IN  CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath,

-  IN  CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText

+  IN  CONST EFI_DEVICE_PATH_PROTOCOL         *DevicePath

   )

 {

   CHAR16  *Converted;

   BOOLEAN Result;

 

-  Converted = DevPathToText->ConvertDevicePathToText (

-                               DevicePath,

-                               FALSE, // DisplayOnly

-                               FALSE  // AllowShortcuts

-                               );

+  Converted = ConvertDevicePathToText (

+                DevicePath,

+                FALSE, // DisplayOnly

+                FALSE  // AllowShortcuts

+                );

   if (Converted == NULL) {

     return FALSE;

   }

@@ -933,9 +932,6 @@ SetBootOrderFromQemu (
   )

 {

   RETURN_STATUS                    Status;

-

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;

-

   FIRMWARE_CONFIG_ITEM             FwCfgItem;

   UINTN                            FwCfgSize;

   CHAR8                            *FwCfg;

@@ -946,15 +942,6 @@ SetBootOrderFromQemu (
   UINTN                            TranslatedSize;

   CHAR16                           Translated[TRANSLATION_OUTPUT_SIZE];

 

-  Status = gBS->LocateProtocol (

-                  &gEfiDevicePathToTextProtocolGuid,

-                  NULL, // optional registration key

-                  (VOID **) &DevPathToText

-                  );

-  if (Status != EFI_SUCCESS) {

-    return Status;

-  }

-

   Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);

   if (Status != RETURN_SUCCESS) {

     return Status;

@@ -1019,8 +1006,7 @@ SetBootOrderFromQemu (
             Match (

               Translated,

               TranslatedSize, // contains length, not size, in CHAR16's here

-              BootOption->DevicePath,

-              DevPathToText

+              BootOption->DevicePath

               )

             ) {

           //

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 7c8cd0dca4..dcfb95aa32 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -1,7 +1,7 @@
 ## @file

 #  EFI/Framework Open Virtual Machine Firmware (OVMF) platform

 #

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

+#  Copyright (c) 2006 - 2013, 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

@@ -90,7 +90,7 @@
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf

   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf

-  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf

   NvVarsFileLib|OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.inf

   FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

@@ -370,6 +370,7 @@
   MdeModulePkg/Core/Dxe/DxeMain.inf {

     <LibraryClasses>

       NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   }

 

   IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf

@@ -431,7 +432,11 @@
   MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

   MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

-  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {

+    <LibraryClasses>

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  }

   MdeModulePkg/Universal/PrintDxe/PrintDxe.inf

   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 89e86e6804..fe77a3a3de 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -1,7 +1,7 @@
 ## @file

 #  Open Virtual Machine Firmware: FDF

 #

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

+#  Copyright (c) 2006 - 2013, 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

@@ -155,6 +155,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE

 

 APRIORI DXE {

+  INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

 }

 

diff --git a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDevicePath.c b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDevicePath.c
index ae44626594..28c4d4f8b6 100644
--- a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDevicePath.c
+++ b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDevicePath.c
@@ -1,7 +1,7 @@
 /** @file

   Internal function defines the default device path string for SecureBoot configuration module.

 

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

+Copyright (c) 2012 - 2013, 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

@@ -14,1431 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "SecureBootConfigImpl.h"

 

-/**

-  Concatenates a formatted unicode string to allocated pool.

-  The caller must free the resulting buffer.

-

-  @param[in, out]  Str      Tracks the allocated pool, size in use, and amount of pool allocated.

-  @param[in]       Fmt      The format string

-  @param[in]       ...      The data will be printed.

-

-  @return Allocated buffer with the formatted string printed in it.

-          The caller must free the allocated buffer.

-          The buffer allocation is not packed.

-

-**/

-CHAR16 *

-EFIAPI

-CatPrint (

-  IN OUT POOL_PRINT   *Str,

-  IN CHAR16           *Fmt,

-  ...

-  )

-{

-  UINT16  *AppendStr;

-  VA_LIST Args;

-  UINTN   StringSize;

-

-  AppendStr = AllocateZeroPool (0x1000);

-  if (AppendStr == NULL) {

-    return Str->Str;

-  }

-

-  VA_START (Args, Fmt);

-  UnicodeVSPrint (AppendStr, 0x1000, Fmt, Args);

-  VA_END (Args);

-  if (NULL == Str->Str) {

-    StringSize   = StrSize (AppendStr);

-    Str->Str  = AllocateZeroPool (StringSize);

-    ASSERT (Str->Str != NULL);

-  } else {

-    StringSize = StrSize (AppendStr);

-    StringSize += (StrSize (Str->Str) - sizeof (UINT16));

-

-    Str->Str = ReallocatePool (

-                StrSize (Str->Str),

-                StringSize,

-                Str->Str

-                );

-    ASSERT (Str->Str != NULL);

-  }

-

-  Str->Maxlen = MAX_CHAR * sizeof (UINT16);

-  if (StringSize < Str->Maxlen) {

-    StrCat (Str->Str, AppendStr);

-    Str->Len = StringSize - sizeof (UINT16);

-  }

-

-  FreePool (AppendStr);

-  return Str->Str;

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathPci (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  PCI_DEVICE_PATH *Pci;

-

-  Pci = DevPath;

-  CatPrint (Str, L"Pci(%x|%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathPccard (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  PCCARD_DEVICE_PATH  *Pccard;

-

-  Pccard = DevPath;

-  CatPrint (Str, L"Pcmcia(Function%x)", (UINTN) Pccard->FunctionNumber);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathMemMap (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MEMMAP_DEVICE_PATH  *MemMap;

-

-  MemMap = DevPath;

-  CatPrint (

-    Str,

-    L"MemMap(%d:%lx-%lx)",

-    (UINTN) MemMap->MemoryType,

-    MemMap->StartingAddress,

-    MemMap->EndingAddress

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathController (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  CONTROLLER_DEVICE_PATH  *Controller;

-

-  Controller = DevPath;

-  CatPrint (Str, L"Ctrl(%d)", (UINTN) Controller->ControllerNumber);

-}

-

-

-/**

-  Convert Vendor device path to device name.

-

-  @param[in, out]  Str      The buffer store device name

-  @param[in]       DevPath  Pointer to vendor device path

-

-**/

-VOID

-DevPathVendor (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  VENDOR_DEVICE_PATH  *Vendor;

-  CHAR16              *Type;

-  UINTN               DataLength;

-  UINTN               Index;

-  UINT32              FlowControlMap;

-

-  UINT16              Info;

-

-  Vendor  = DevPath;

-

-  switch (DevicePathType (&Vendor->Header)) {

-  case HARDWARE_DEVICE_PATH:

-    Type = L"Hw";

-    break;

-

-  case MESSAGING_DEVICE_PATH:

-    Type = L"Msg";

-    if (CompareGuid (&Vendor->Guid, &gEfiPcAnsiGuid)) {

-      CatPrint (Str, L"VenPcAnsi()");

-      return ;

-    } else if (CompareGuid (&Vendor->Guid, &gEfiVT100Guid)) {

-      CatPrint (Str, L"VenVt100()");

-      return ;

-    } else if (CompareGuid (&Vendor->Guid, &gEfiVT100PlusGuid)) {

-      CatPrint (Str, L"VenVt100Plus()");

-      return ;

-    } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {

-      CatPrint (Str, L"VenUft8()");

-      return ;

-    } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid     )) {

-      FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap);

-      switch (FlowControlMap & 0x00000003) {

-      case 0:

-        CatPrint (Str, L"UartFlowCtrl(%s)", L"None");

-        break;

-

-      case 1:

-        CatPrint (Str, L"UartFlowCtrl(%s)", L"Hardware");

-        break;

-

-      case 2:

-        CatPrint (Str, L"UartFlowCtrl(%s)", L"XonXoff");

-        break;

-

-      default:

-        break;

-      }

-

-      return ;

-

-    } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) {

-      CatPrint (

-        Str,

-        L"SAS(%lx,%lx,%x,",

-        ((SAS_DEVICE_PATH *) Vendor)->SasAddress,

-        ((SAS_DEVICE_PATH *) Vendor)->Lun,

-        (UINTN) ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort

-        );

-      Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);

-      if ((Info & 0x0f) == 0) {

-        CatPrint (Str, L"NoTopology,0,0,0,");

-      } else if (((Info & 0x0f) == 1) || ((Info & 0x0f) == 2)) {

-        CatPrint (

-          Str,

-          L"%s,%s,%s,",

-          ((Info & (0x1 << 4)) != 0) ? L"SATA" : L"SAS",

-          ((Info & (0x1 << 5)) != 0) ? L"External" : L"Internal",

-          ((Info & (0x1 << 6)) != 0) ? L"Expanded" : L"Direct"

-          );

-        if ((Info & 0x0f) == 1) {

-          CatPrint (Str, L"0,");

-        } else {

-          CatPrint (Str, L"%x,", (UINTN) ((Info >> 8) & 0xff));

-        }

-      } else {

-        CatPrint (Str, L"0,0,0,0,");

-      }

-

-      CatPrint (Str, L"%x)", (UINTN) ((SAS_DEVICE_PATH *) Vendor)->Reserved);

-      return ;

-

-    } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) {

-      CatPrint (Str, L"DebugPort()");

-      return ;

-    }

-    break;

-

-  case MEDIA_DEVICE_PATH:

-    Type = L"Media";

-    break;

-

-  default:

-    Type = L"?";

-    break;

-  }

-

-  CatPrint (Str, L"Ven%s(%g", Type, &Vendor->Guid);

-  DataLength = DevicePathNodeLength (&Vendor->Header) - sizeof (VENDOR_DEVICE_PATH);

-  if (DataLength > 0) {

-    CatPrint (Str, L",");

-    for (Index = 0; Index < DataLength; Index++) {

-      CatPrint (Str, L"%02x", (UINTN) ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);

-    }

-  }

-  CatPrint (Str, L")");

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathAcpi (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  ACPI_HID_DEVICE_PATH  *Acpi;

-

-  Acpi = DevPath;

-  if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

-    CatPrint (Str, L"Acpi(PNP%04x,%x)", (UINTN)  EISA_ID_TO_NUM (Acpi->HID), (UINTN) Acpi->UID);

-  } else {

-    CatPrint (Str, L"Acpi(%08x,%x)", (UINTN) Acpi->HID, (UINTN) Acpi->UID);

-  }

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathExtendedAcpi (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  ACPI_EXTENDED_HID_DEVICE_PATH   *ExtendedAcpi;

-  

-  //

-  // Index for HID, UID and CID strings, 0 for non-exist

-  //

-  UINT16                          HIDSTRIdx;

-  UINT16                          UIDSTRIdx;

-  UINT16                          CIDSTRIdx;

-  UINT16                          Index;

-  UINT16                          Length;

-  UINT16                          Anchor;

-  CHAR8                           *AsChar8Array;

-

-  HIDSTRIdx    = 0;

-  UIDSTRIdx    = 0;

-  CIDSTRIdx    = 0;

-  ExtendedAcpi = DevPath;

-  Length       = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) ExtendedAcpi);

-

-  AsChar8Array = (CHAR8 *) ExtendedAcpi;

-

-  //

-  // find HIDSTR

-  //

-  Anchor = 16;

-  for (Index = Anchor; Index < Length && AsChar8Array[Index] != '\0'; Index++) {

-    ;

-  }

-  if (Index > Anchor) {

-    HIDSTRIdx = Anchor;

-  }

-  //

-  // find UIDSTR

-  //

-  Anchor = (UINT16) (Index + 1);

-  for (Index = Anchor; Index < Length && AsChar8Array[Index] != '\0'; Index++) {

-    ;

-  }

-  if (Index > Anchor) {

-    UIDSTRIdx = Anchor;

-  }

-  //

-  // find CIDSTR

-  //

-  Anchor = (UINT16) (Index + 1);

-  for (Index = Anchor; Index < Length && AsChar8Array[Index] != '\0'; Index++) {

-    ;

-  }

-  if (Index > Anchor) {

-    CIDSTRIdx = Anchor;

-  }

-

-  if (HIDSTRIdx == 0 && CIDSTRIdx == 0 && ExtendedAcpi->UID == 0) {

-    CatPrint (Str, L"AcpiExp(");

-    if ((ExtendedAcpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

-      CatPrint (Str, L"PNP%04x,", (UINTN) EISA_ID_TO_NUM (ExtendedAcpi->HID));

-    } else {

-      CatPrint (Str, L"%08x,", (UINTN) ExtendedAcpi->HID);

-    }

-    if ((ExtendedAcpi->CID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

-      CatPrint (Str, L"PNP%04x,", (UINTN)  EISA_ID_TO_NUM (ExtendedAcpi->CID));

-    } else {

-      CatPrint (Str, L"%08x,", (UINTN)  ExtendedAcpi->CID);

-    }

-    if (UIDSTRIdx != 0) {

-      CatPrint (Str, L"%a)", AsChar8Array + UIDSTRIdx);

-    } else {

-      CatPrint (Str, L"\"\")");

-    }

-  } else {

-    CatPrint (Str, L"AcpiEx(");

-    if ((ExtendedAcpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

-      CatPrint (Str, L"PNP%04x,", (UINTN)  EISA_ID_TO_NUM (ExtendedAcpi->HID));

-    } else {

-      CatPrint (Str, L"%08x,", (UINTN) ExtendedAcpi->HID);

-    }

-    if ((ExtendedAcpi->CID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {

-      CatPrint (Str, L"PNP%04x,", (UINTN) EISA_ID_TO_NUM (ExtendedAcpi->CID));

-    } else {

-      CatPrint (Str, L"%08x,", (UINTN) ExtendedAcpi->CID);

-    }

-    CatPrint (Str, L"%x,", (UINTN) ExtendedAcpi->UID);

-

-    if (HIDSTRIdx != 0) {

-      CatPrint (Str, L"%a,", AsChar8Array + HIDSTRIdx);

-    } else {

-      CatPrint (Str, L"\"\",");

-    }

-    if (CIDSTRIdx != 0) {

-      CatPrint (Str, L"%a,", AsChar8Array + CIDSTRIdx);

-    } else {

-      CatPrint (Str, L"\"\",");

-    }

-    if (UIDSTRIdx != 0) {

-      CatPrint (Str, L"%a)", AsChar8Array + UIDSTRIdx);

-    } else {

-      CatPrint (Str, L"\"\")");

-    }

-  }

-

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathAdrAcpi (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  ACPI_ADR_DEVICE_PATH    *AcpiAdr;

-  UINT16                  Index;

-  UINT16                  Length;

-  UINT16                  AdditionalAdrCount;

-

-  AcpiAdr            = DevPath;

-  Length             = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr);

-  AdditionalAdrCount = (UINT16) ((Length - 8) / 4);

-

-  CatPrint (Str, L"AcpiAdr(%x", (UINTN) AcpiAdr->ADR);

-  for (Index = 0; Index < AdditionalAdrCount; Index++) {

-    CatPrint (Str, L",%x", (UINTN) *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));

-  }

-  CatPrint (Str, L")");

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathAtapi (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  ATAPI_DEVICE_PATH *Atapi;

-

-  Atapi = DevPath;

-  CatPrint (

-    Str,

-    L"Ata(%s,%s)",

-    (Atapi->PrimarySecondary != 0)? L"Secondary" : L"Primary",

-    (Atapi->SlaveMaster != 0)? L"Slave" : L"Master"

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathScsi (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  SCSI_DEVICE_PATH  *Scsi;

-

-  Scsi = DevPath;

-  CatPrint (Str, L"Scsi(Pun%x,Lun%x)", (UINTN) Scsi->Pun, (UINTN) Scsi->Lun);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-  

-**/

-VOID

-DevPathFibre (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  FIBRECHANNEL_DEVICE_PATH  *Fibre;

-

-  Fibre = DevPath;

-  CatPrint (Str, L"Fibre(Wwn%lx,Lun%x)", Fibre->WWN, Fibre->Lun);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPath1394 (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  F1394_DEVICE_PATH *F1394Path;

-

-  F1394Path = DevPath;

-  CatPrint (Str, L"1394(%lx)", &F1394Path->Guid);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-  

-**/

-VOID

-DevPathUsb (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  USB_DEVICE_PATH *Usb;

-

-  Usb = DevPath;

-  CatPrint (Str, L"Usb(%x,%x)", (UINTN) Usb->ParentPortNumber, (UINTN) Usb->InterfaceNumber);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathUsbWWID (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  USB_WWID_DEVICE_PATH  *UsbWWId;

-

-  UsbWWId = DevPath;

-  CatPrint (

-    Str,

-    L"UsbWwid(%x,%x,%x,\"WWID\")",

-    (UINTN) UsbWWId->VendorId,

-    (UINTN) UsbWWId->ProductId,

-    (UINTN) UsbWWId->InterfaceNumber

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathLogicalUnit (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;

-

-  LogicalUnit = DevPath;

-  CatPrint (Str, L"Unit(%x)", (UINTN) LogicalUnit->Lun);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathUsbClass (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  USB_CLASS_DEVICE_PATH *UsbClass;

-

-  UsbClass = DevPath;

-  CatPrint (

-    Str,

-    L"Usb Class(%x,%x,%x,%x,%x)",

-    (UINTN) UsbClass->VendorId,

-    (UINTN) UsbClass->ProductId,

-    (UINTN) UsbClass->DeviceClass,

-    (UINTN) UsbClass->DeviceSubClass,

-    (UINTN) UsbClass->DeviceProtocol

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathSata (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  SATA_DEVICE_PATH *Sata;

-

-  Sata = DevPath;

-  if ((Sata->PortMultiplierPortNumber & SATA_HBA_DIRECT_CONNECT_FLAG) != 0) {

-    CatPrint (

-      Str,

-      L"Sata(%x,%x)",

-      (UINTN) Sata->HBAPortNumber,

-      (UINTN) Sata->Lun

-      );

-  } else {

-    CatPrint (

-      Str,

-      L"Sata(%x,%x,%x)",

-      (UINTN) Sata->HBAPortNumber,

-      (UINTN) Sata->PortMultiplierPortNumber,

-      (UINTN) Sata->Lun

-      );

-  }

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathI2O (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  I2O_DEVICE_PATH *I2OPath;

-

-  I2OPath = DevPath;

-  CatPrint (Str, L"I2O(%x)", (UINTN) I2OPath->Tid);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathMacAddr (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MAC_ADDR_DEVICE_PATH  *MACDevPath;

-  UINTN                 HwAddressSize;

-  UINTN                 Index;

-

-  MACDevPath           = DevPath;

-

-  HwAddressSize = sizeof (EFI_MAC_ADDRESS);

-  if (MACDevPath->IfType == 0x01 || MACDevPath->IfType == 0x00) {

-    HwAddressSize = 6;

-  }

-

-  CatPrint (Str, L"Mac(");

-

-  for (Index = 0; Index < HwAddressSize; Index++) {

-    CatPrint (Str, L"%02x", (UINTN) MACDevPath->MacAddress.Addr[Index]);

-  }

-

-  CatPrint (Str, L")");

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathIPv4 (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  IPv4_DEVICE_PATH  *IPDevPath;

-

-  IPDevPath = DevPath;

-  CatPrint (

-    Str,

-    L"IPv4(%d.%d.%d.%d:%d)",

-    (UINTN) IPDevPath->RemoteIpAddress.Addr[0],

-    (UINTN) IPDevPath->RemoteIpAddress.Addr[1],

-    (UINTN) IPDevPath->RemoteIpAddress.Addr[2],

-    (UINTN) IPDevPath->RemoteIpAddress.Addr[3],

-    (UINTN) IPDevPath->RemotePort

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathIPv6 (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  IPv6_DEVICE_PATH  *IPv6DevPath;

-

-  IPv6DevPath = DevPath;

-  CatPrint (

-    Str,

-    L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[0],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[1],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[2],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[3],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[4],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[5],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[6],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[7],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[8],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[9],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[10],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[11],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[12],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[13],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[14],

-    (UINTN) IPv6DevPath->RemoteIpAddress.Addr[15]

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathInfiniBand (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  INFINIBAND_DEVICE_PATH  *InfiniBand;

-

-  InfiniBand = DevPath;

-  CatPrint (

-    Str,

-    L"Infiniband(%x,%g,%lx,%lx,%lx)",

-    (UINTN) InfiniBand->ResourceFlags,

-    InfiniBand->PortGid,

-    InfiniBand->ServiceId,

-    InfiniBand->TargetPortId,

-    InfiniBand->DeviceId

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathUart (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  UART_DEVICE_PATH  *Uart;

-  CHAR8             Parity;

-

-  Uart = DevPath;

-  switch (Uart->Parity) {

-  case 0:

-    Parity = 'D';

-    break;

-

-  case 1:

-    Parity = 'N';

-    break;

-

-  case 2:

-    Parity = 'E';

-    break;

-

-  case 3:

-    Parity = 'O';

-    break;

-

-  case 4:

-    Parity = 'M';

-    break;

-

-  case 5:

-    Parity = 'S';

-    break;

-

-  default:

-    Parity = 'x';

-    break;

-  }

-

-  if (Uart->BaudRate == 0) {

-    CatPrint (Str, L"Uart(DEFAULT,%c,", Parity);

-  } else {

-    CatPrint (Str, L"Uart(%ld,%c,", Uart->BaudRate, Parity);

-  }

-

-  if (Uart->DataBits == 0) {

-    CatPrint (Str, L"D,");

-  } else {

-    CatPrint (Str, L"%d,", (UINTN) Uart->DataBits);

-  }

-

-  switch (Uart->StopBits) {

-  case 0:

-    CatPrint (Str, L"D)");

-    break;

-

-  case 1:

-    CatPrint (Str, L"1)");

-    break;

-

-  case 2:

-    CatPrint (Str, L"1.5)");

-    break;

-

-  case 3:

-    CatPrint (Str, L"2)");

-    break;

-

-  default:

-    CatPrint (Str, L"x)");

-    break;

-  }

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathiSCSI (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  ISCSI_DEVICE_PATH_WITH_NAME *IScsi;

-  UINT16                      Options;

-

-  IScsi = DevPath;

-  CatPrint (

-    Str,

-    L"iSCSI(%a,%x,%lx,",

-    IScsi->TargetName,

-    (UINTN) IScsi->TargetPortalGroupTag,

-    IScsi->Lun

-    );

-

-  Options = IScsi->LoginOption;

-  CatPrint (Str, L"%s,", (((Options >> 1) & 0x0001) != 0) ? L"CRC32C" : L"None");

-  CatPrint (Str, L"%s,", (((Options >> 3) & 0x0001) != 0) ? L"CRC32C" : L"None");

-  if (((Options >> 11) & 0x0001) != 0) {

-    CatPrint (Str, L"%s,", L"None");

-  } else if (((Options >> 12) & 0x0001) != 0) {

-    CatPrint (Str, L"%s,", L"CHAP_UNI");

-  } else {

-    CatPrint (Str, L"%s,", L"CHAP_BI");

-

-  }

-

-  CatPrint (Str, L"%s)", (IScsi->NetworkProtocol == 0) ? L"TCP" : L"reserved");

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathVlan (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  VLAN_DEVICE_PATH  *Vlan;

-

-  Vlan = DevPath;

-  CatPrint (Str, L"Vlan(%d)", (UINTN) Vlan->VlanId);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathHardDrive (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  HARDDRIVE_DEVICE_PATH *Hd;

-

-  Hd = DevPath;

-  switch (Hd->SignatureType) {

-  case SIGNATURE_TYPE_MBR:

-    CatPrint (

-      Str,

-      L"HD(Part%d,Sig%08x)",

-      (UINTN) Hd->PartitionNumber,

-      (UINTN) *((UINT32 *) (&(Hd->Signature[0])))

-      );

-    break;

-

-  case SIGNATURE_TYPE_GUID:

-    CatPrint (

-      Str,

-      L"HD(Part%d,Sig%g)",

-      (UINTN) Hd->PartitionNumber,

-      (EFI_GUID *) &(Hd->Signature[0])

-      );

-    break;

-

-  default:

-    CatPrint (

-      Str,

-      L"HD(Part%d,MBRType=%02x,SigType=%02x)",

-      (UINTN) Hd->PartitionNumber,

-      (UINTN) Hd->MBRType,

-      (UINTN) Hd->SignatureType

-      );

-    break;

-  }

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathCDROM (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  CDROM_DEVICE_PATH *Cd;

-

-  Cd = DevPath;

-  CatPrint (Str, L"CDROM(Entry%x)", (UINTN) Cd->BootEntry);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathFilePath (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  FILEPATH_DEVICE_PATH  *Fp;

-

-  Fp = DevPath;

-  CatPrint (Str, L"%s", Fp->PathName);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathMediaProtocol (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MEDIA_PROTOCOL_DEVICE_PATH  *MediaProt;

-

-  MediaProt = DevPath;

-  CatPrint (Str, L"Media(%g)", &MediaProt->Protocol);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathFvFilePath (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFilePath;

-

-  FvFilePath = DevPath;

-  CatPrint (Str, L"%g", &FvFilePath->FvFileName);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathRelativeOffsetRange (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;

-

-  Offset = DevPath;

-  CatPrint (

-    Str,

-    L"Offset(%lx,%lx)",

-    Offset->StartingOffset,

-    Offset->EndingOffset

-    );

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathBssBss (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  BBS_BBS_DEVICE_PATH *Bbs;

-  CHAR16              *Type;

-

-  Bbs = DevPath;

-  switch (Bbs->DeviceType) {

-  case BBS_TYPE_FLOPPY:

-    Type = L"Floppy";

-    break;

-

-  case BBS_TYPE_HARDDRIVE:

-    Type = L"Harddrive";

-    break;

-

-  case BBS_TYPE_CDROM:

-    Type = L"CDROM";

-    break;

-

-  case BBS_TYPE_PCMCIA:

-    Type = L"PCMCIA";

-    break;

-

-  case BBS_TYPE_USB:

-    Type = L"Usb";

-    break;

-

-  case BBS_TYPE_EMBEDDED_NETWORK:

-    Type = L"Net";

-    break;

-

-  case BBS_TYPE_BEV:

-    Type = L"BEV";

-    break;

-

-  default:

-    Type = L"?";

-    break;

-  }

-  CatPrint (Str, L"Legacy-%s", Type);

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathEndInstance (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  CatPrint (Str, L",");

-}

-

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathNodeUnknown (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  CatPrint (Str, L"?");

-}

-/**

-  Convert Device Path to a Unicode string for printing.

-

-  @param[in, out] Str           The buffer holding the output string.

-                                This buffer contains the length of the string and 

-                                the maixmum length reserved for the string buffer.

-  @param[in]      DevPath       The device path.

-

-**/

-VOID

-DevPathFvPath (

-  IN OUT POOL_PRINT       *Str,

-  IN VOID                 *DevPath

-  )

-{

-  MEDIA_FW_VOL_DEVICE_PATH *FvPath;

-

-  FvPath = DevPath;

-  CatPrint (Str, L"Fv(%g)", &FvPath->FvName);

-}

-

-DEVICE_PATH_STRING_TABLE  DevPathTable[] = {

-  {

-    HARDWARE_DEVICE_PATH,

-    HW_PCI_DP,

-    DevPathPci

-  },

-  {

-    HARDWARE_DEVICE_PATH,

-    HW_PCCARD_DP,

-    DevPathPccard

-  },

-  {

-    HARDWARE_DEVICE_PATH,

-    HW_MEMMAP_DP,

-    DevPathMemMap

-  },

-  {

-    HARDWARE_DEVICE_PATH,

-    HW_VENDOR_DP,

-    DevPathVendor

-  },

-  {

-    HARDWARE_DEVICE_PATH,

-    HW_CONTROLLER_DP,

-    DevPathController

-  },

-  {

-    ACPI_DEVICE_PATH,

-    ACPI_DP,

-    DevPathAcpi

-  },

-  {

-    ACPI_DEVICE_PATH,

-    ACPI_EXTENDED_DP,

-    DevPathExtendedAcpi

-  },

-  {

-    ACPI_DEVICE_PATH,

-    ACPI_ADR_DP,

-    DevPathAdrAcpi

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_ATAPI_DP,

-    DevPathAtapi

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_SCSI_DP,

-    DevPathScsi

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_FIBRECHANNEL_DP,

-    DevPathFibre

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_1394_DP,

-    DevPath1394

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_USB_DP,

-    DevPathUsb

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_USB_WWID_DP,

-    DevPathUsbWWID

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_DEVICE_LOGICAL_UNIT_DP,

-    DevPathLogicalUnit

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_USB_CLASS_DP,

-    DevPathUsbClass

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_SATA_DP,

-    DevPathSata

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_I2O_DP,

-    DevPathI2O

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_MAC_ADDR_DP,

-    DevPathMacAddr

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_IPv4_DP,

-    DevPathIPv4

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_IPv6_DP,

-    DevPathIPv6

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_INFINIBAND_DP,

-    DevPathInfiniBand

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_UART_DP,

-    DevPathUart

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_VENDOR_DP,

-    DevPathVendor

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_ISCSI_DP,

-    DevPathiSCSI

-  },

-  {

-    MESSAGING_DEVICE_PATH,

-    MSG_VLAN_DP,

-    DevPathVlan

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_HARDDRIVE_DP,

-    DevPathHardDrive

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_CDROM_DP,

-    DevPathCDROM

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_VENDOR_DP,

-    DevPathVendor

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_FILEPATH_DP,

-    DevPathFilePath

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_PROTOCOL_DP,

-    DevPathMediaProtocol

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_PIWG_FW_VOL_DP,

-    DevPathFvPath,

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_PIWG_FW_FILE_DP,

-    DevPathFvFilePath

-  },

-  {

-    MEDIA_DEVICE_PATH,

-    MEDIA_RELATIVE_OFFSET_RANGE_DP,

-    DevPathRelativeOffsetRange,

-  },

-  {

-    BBS_DEVICE_PATH,

-    BBS_BBS_DP,

-    DevPathBssBss

-  },

-  {

-    END_DEVICE_PATH_TYPE,

-    END_INSTANCE_DEVICE_PATH_SUBTYPE,

-    DevPathEndInstance

-  },

-  {

-    0,

-    0,

-    NULL

-  }

-};

-

 

 /**

   This function converts an input device structure to a Unicode string.

@@ -1454,84 +29,10 @@ DevicePathToStr (
   IN EFI_DEVICE_PATH_PROTOCOL     *DevPath

   )

 {

-  POOL_PRINT                Str;

-  EFI_DEVICE_PATH_PROTOCOL  *DevPathNode;

-  VOID (*DumpNode) (POOL_PRINT *, VOID *);

-

-  UINTN Index;

-  UINTN NewSize;

-

-  EFI_STATUS                       Status;

-  CHAR16                           *ToText;

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;

-

-  ZeroMem (&Str, sizeof (Str));

-

-  if (DevPath == NULL) {

-    goto Done;

-  }

-

-  Status = gBS->LocateProtocol (

-                  &gEfiDevicePathToTextProtocolGuid,

-                  NULL,

-                  (VOID **) &DevPathToText

-                  );

-  if (!EFI_ERROR (Status)) {

-    ToText = DevPathToText->ConvertDevicePathToText (

-                              DevPath,

-                              FALSE,

-                              TRUE

-                              );

-    ASSERT (ToText != NULL);

-    return ToText;

-  }

-

-  //

-  // Process each device path node

-  //

-  DevPathNode = DevPath;

-  while (!IsDevicePathEnd (DevPathNode)) {

-    //

-    // Find the handler to dump this device path node

-    //

-    DumpNode = NULL;

-    for (Index = 0; DevPathTable[Index].Function != NULL; Index += 1) {

-

-      if (DevicePathType (DevPathNode) == DevPathTable[Index].Type &&

-          DevicePathSubType (DevPathNode) == DevPathTable[Index].SubType

-          ) {

-        DumpNode = DevPathTable[Index].Function;

-        break;

-      }

-    }

-    //

-    // If not found, use a generic function

-    //

-    if (!DumpNode) {

-      DumpNode = DevPathNodeUnknown;

-    }

-    //

-    //  Put a path seperator in if needed

-    //

-    if ((Str.Len != 0) && (DumpNode != DevPathEndInstance)) {

-      CatPrint (&Str, L"/");

-    }

-    //

-    // Print this node of the device path

-    //

-    DumpNode (&Str, DevPathNode);

-

-    //

-    // Next device path node

-    //

-    DevPathNode = NextDevicePathNode (DevPathNode);

-  }

-

-Done:

-  NewSize = (Str.Len + 1) * sizeof (CHAR16);

-  Str.Str = ReallocatePool (NewSize, NewSize, Str.Str);

-  ASSERT (Str.Str != NULL);

-  Str.Str[Str.Len] = 0;

-  return Str.Str;

+  return ConvertDevicePathToText (

+           DevPath,

+           FALSE,

+           TRUE

+           );

 }

 

diff --git a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf
index 74d4745bfa..a6bd1a3613 100644
--- a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf
+++ b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf
@@ -4,7 +4,7 @@
 # Need custom SecureBootConfigDxe for OVMF that does not force

 # resets after PK changes since OVMF doesn't have persistent variables

 #

-# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2011 - 2013, 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

@@ -56,7 +56,8 @@
   UefiHiiServicesLib

   DebugLib

   HiiLib

-  PlatformSecureLib  

+  PlatformSecureLib

+  DevicePathLib

 

 [Guids]

   gEfiIfrTianoGuid

@@ -72,21 +73,7 @@
   gEfiImageSecurityDatabaseGuid                 ## CONSUMES

   gEfiFileSystemVolumeLabelInfoIdGuid           ## CONSUMES

   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid

-  gEfiVT100PlusGuid                             ## CONSUMES ## GUID (The type of terminal)

-  gEfiVT100Guid                                 ## CONSUMES ## GUID (The type of terminal)

-                                                ## CONSUMES ## GUID HOB (The hob holding memory type information)

-  gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)

-                                                ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)

-                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)

   gEfiFileInfoGuid                              ## CONSUMES ## GUID

-  gEfiPcAnsiGuid                                ## CONSUMES ## GUID (The type of terminal)

-  gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)

-  gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)

 

 [Protocols]

   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES

@@ -95,8 +82,6 @@
   gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES

   gEfiBlockIoProtocolGuid                       ## PROTOCOL CONSUMES

   gEfiDevicePathProtocolGuid                    ## PROTOCOL CONSUMES

-  gEfiDevicePathToTextProtocolGuid

-  gEfiDebugPortProtocolGuid

 

 [Depex]

   gEfiHiiConfigRoutingProtocolGuid  AND

diff --git a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigImpl.h b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigImpl.h
index 5a5ac12426..414ab65c8b 100644
--- a/OvmfPkg/SecureBootConfigDxe/SecureBootConfigImpl.h
+++ b/OvmfPkg/SecureBootConfigDxe/SecureBootConfigImpl.h
@@ -2,7 +2,7 @@
   The header file of HII Config Access protocol implementation of SecureBoot

   configuration module.

 

-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2011 - 2013, 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

@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleFileSystem.h>

 #include <Protocol/BlockIo.h>

 #include <Protocol/DevicePath.h>

-#include <Protocol/DevicePathToText.h>

 #include <Protocol/DebugPort.h>

 #include <Protocol/LoadFile.h>