Re: [edk2] [patch 2/5] MdePkg: Correct the string order of ACPI Expanded Device Path

[Ni, Ruiyu]

On 10/8/2018 11:31 AM, Dandan Bi wrote:

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1227

According to UEFI Spec, ACPI Expanded Device Path can be display
AcpiEx(HID|HIDSTR,(CID|CIDSTR,UID|UIDSTR)), but current code display
UID|UIDSTR before CID|CIDSTR.
This patch is to fix this issue.

Cc: Ruiyu Ni <ruiyu...@intel.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
  MdePkg/Library/UefiDevicePathLib/DevicePathToText.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c 
b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 85f5e97131..1c08a3ec2f 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
@@ -475,20 +475,20 @@ DevPathToTextAcpiEx (
          UefiDevicePathLibCatPrint (Str, L"AcpiEx(%a,", HIDStr);
        } else {
          UefiDevicePathLibCatPrint (Str, L"AcpiEx(%s,", HIDText);
        }

- if (AcpiEx->UID == 0) {

-        UefiDevicePathLibCatPrint (Str, L"%a,", UIDStr);
+      if (AcpiEx->CID == 0) {
+        UefiDevicePathLibCatPrint (Str, L"%a,", CIDStr);
        } else {
-        UefiDevicePathLibCatPrint (Str, L"0x%x,", AcpiEx->UID);
+        UefiDevicePathLibCatPrint (Str, L"%s,", CIDText);
        }

- if (AcpiEx->CID == 0) {

-        UefiDevicePathLibCatPrint (Str, L"%a)", CIDStr);
+      if (AcpiEx->UID == 0) {
+        UefiDevicePathLibCatPrint (Str, L"%a)", UIDStr);
        } else {
-        UefiDevicePathLibCatPrint (Str, L"%s)", CIDText);
+        UefiDevicePathLibCatPrint (Str, L"0x%x)", AcpiEx->UID);
        }
      } else {
        UefiDevicePathLibCatPrint (
          Str,
          L"AcpiEx(%s,%s,0x%x,%a,%a,%a)",

Reviewed-by: Ruiyu Ni <ruiyu...@intel.com>

--
Thanks,
Ray
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel