MdePkg: Correct the string order of ACPI Expanded Device Path

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.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Dandan Bi 2018-10-05 13:21:57 +08:00 committed by Liming Gao
parent 959be180e1
commit 05fe752589
1 changed files with 6 additions and 6 deletions

View File

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