From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Sat, 11 May 2019 21:11:48 +0000 (+0200)
Subject: efi_loader: ACPI device node to text
X-Git-Tag: v2019.07-rc2~3^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05fefe768177dee6d5ffa6e95867806adc030c21;p=oweals%2Fu-boot.git

efi_loader: ACPI device node to text

The device path to text protocol renders ACPI device nodes incorrectly.

Use capital hexadecimal numbers as shown in the UEFI spec examples.

Always output the optional UID. This matches what UEFI SCT expects and
saves us an `if`.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c
index e219f84b28..f3a9579076 100644
--- a/lib/efi_loader/efi_device_path_to_text.c
+++ b/lib/efi_loader/efi_device_path_to_text.c
@@ -78,9 +78,9 @@ static char *dp_acpi(char *s, struct efi_device_path *dp)
 	case DEVICE_PATH_SUB_TYPE_ACPI_DEVICE: {
 		struct efi_device_path_acpi_path *adp =
 			(struct efi_device_path_acpi_path *)dp;
-		s += sprintf(s, "Acpi(PNP%04x", EISA_PNP_NUM(adp->hid));
-		if (adp->uid)
-			s += sprintf(s, ",%d", adp->uid);
+
+		s += sprintf(s, "Acpi(PNP%04X", EISA_PNP_NUM(adp->hid));
+		s += sprintf(s, ",%d", adp->uid);
 		s += sprintf(s, ")");
 		break;
 	}