MdePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdePkg / Library / UefiDevicePathLib / DevicePathToText.c

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 8e5efba1e8e14bc4a13217dd6bef87b59e0f177f..fb65ebd8f40a806eed35104c7f1a6aa11c54ecf0 100644 (file)
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
@@ -3,13 +3,7 @@
 \r
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>\r
-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
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -433,6 +427,27 @@ DevPathToTextAcpiEx (
   UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;\r
   CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;\r
 \r
+  if (DisplayOnly) {\r
+    if ((EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A03) ||\r
+        (EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A03 && EISA_ID_TO_NUM (AcpiEx->HID) != 0x0A08)) {\r
+      if (AcpiEx->UID == 0) {\r
+        UefiDevicePathLibCatPrint (Str, L"PciRoot(%a)", UIDStr);\r
+      } else {\r
+        UefiDevicePathLibCatPrint (Str, L"PciRoot(0x%x)", AcpiEx->UID);\r
+      }\r
+      return;\r
+    }\r
+\r
+    if (EISA_ID_TO_NUM (AcpiEx->HID) == 0x0A08 || EISA_ID_TO_NUM (AcpiEx->CID) == 0x0A08) {\r
+      if (AcpiEx->UID == 0) {\r
+        UefiDevicePathLibCatPrint (Str, L"PcieRoot(%a)", UIDStr);\r
+      } else {\r
+        UefiDevicePathLibCatPrint (Str, L"PcieRoot(0x%x)", AcpiEx->UID);\r
+      }\r
+      return;\r
+    }\r
+  }\r
+\r
   //\r
   // Converts EISA identification to string.\r
   //\r
@@ -459,15 +474,24 @@ DevPathToTextAcpiEx (
     //\r
     // use AcpiExp()\r
     //\r
-    UefiDevicePathLibCatPrint (\r
-      Str,\r
-      L"AcpiExp(%s,%s,%a)",\r
-      HIDText,\r
-      CIDText,\r
-      UIDStr\r
-      );\r
+    if (AcpiEx->CID == 0) {\r
+      UefiDevicePathLibCatPrint (\r
+        Str,\r
+        L"AcpiExp(%s,0,%a)",\r
+        HIDText,\r
+        UIDStr\r
+       );\r
+    } else {\r
+      UefiDevicePathLibCatPrint (\r
+        Str,\r
+        L"AcpiExp(%s,%s,%a)",\r
+        HIDText,\r
+        CIDText,\r
+        UIDStr\r
+       );\r
+    }\r
   } else {\r
-    if (AllowShortcuts) {\r
+    if (DisplayOnly) {\r
       //\r
       // display only\r
       //\r
@@ -942,7 +966,7 @@ DevPathToTextUsbWWID (
 \r
   SerialNumberStr = (CHAR16 *) ((UINT8 *) UsbWWId + sizeof (USB_WWID_DEVICE_PATH));\r
   Length = (UINT16) ((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16));\r
-  if (SerialNumberStr [Length - 1] != 0) {\r
+  if (Length >= 1 && SerialNumberStr [Length - 1] != 0) {\r
     //\r
     // In case no NULL terminator in SerialNumber, create a new one with NULL terminator\r
     //\r