git: 13cc5276ea39 - stable/12 - stand: libefi: swap /Pci() printing around
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Apr 2022 22:34:52 UTC
The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=13cc5276ea3914d6a9a9d4649490b4da356b540e commit 13cc5276ea3914d6a9a9d4649490b4da356b540e Author: Kyle Evans <kevans@FreeBSD.org> AuthorDate: 2022-04-13 00:29:54 +0000 Commit: Kyle Evans <kevans@FreeBSD.org> CommitDate: 2022-04-21 22:33:09 +0000 stand: libefi: swap /Pci() printing around Printing device followed by interface matches, e.g., edk2. Note that this is only a fallback, many firmware implementations will provide the protocol that we'll use to format device paths. Reviewed by: imp, tsoome Sponsored by: Ampere Computing Submitted by: Klara, Inc. (cherry picked from commit 454630c72556d45e401f29f56b3317c2fb0499a0) --- stand/efi/libefi/devpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c index b56c583b5fa7..c25ae73e463c 100644 --- a/stand/efi/libefi/devpath.c +++ b/stand/efi/libefi/devpath.c @@ -146,8 +146,8 @@ efi_hw_dev_path(EFI_DEVICE_PATH *node, char *suffix) switch (subtype) { case HW_PCI_DP: if (asprintf(&name, "Pci(%x,%x)%s", - ((PCI_DEVICE_PATH *)node)->Function, - ((PCI_DEVICE_PATH *)node)->Device, tail) < 0) + ((PCI_DEVICE_PATH *)node)->Device, + ((PCI_DEVICE_PATH *)node)->Function, tail) < 0) name = NULL; break; case HW_PCCARD_DP: