From f701ff47a8b19549ecbac24ab0e21ee59ac752ac Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 26 Dec 2003 23:56:29 +0000 Subject: [PATCH] Merged bug fixes from Debian patches * lspci.c (show_verbose): "Cache Line Size" should be capitalized. * lspci.c (show_pcix_nobridge): Added a missing newline. git-archimport-id: mj@ucw.cz--public/pciutils--main--2.2--patch-22 --- ChangeLog | 8 +++++++- lspci.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3527b7a..ffe9dbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ 2003-12-27 Martin Mares + Merged bug fixes from Debian patches: + + * lspci.c (show_verbose): "Cache Line Size" should be capitalized. + + * lspci.c (show_pcix_nobridge): Added a missing newline. + * lib/proc.c (proc_scan): When reading the header type, don't forget to clear the topmost bit indicating that the device has - multiple functions. Grabbed from Debian patches. + multiple functions. 2003-12-27 Martin Mares diff --git a/lspci.c b/lspci.c index 6bdcf38..8bd628d 100644 --- a/lspci.c +++ b/lspci.c @@ -468,7 +468,7 @@ show_pcix_nobridge(struct device *d, int where) FLAG(command, PCI_PCIX_COMMAND_ERO), ((command & PCI_PCIX_COMMAND_MAX_MEM_READ_BYTE_COUNT) >> 2U), ((command & PCI_PCIX_COMMAND_MAX_OUTSTANDING_SPLIT_TRANS) >> 4U)); - printf("\t\tStatus: Bus=%u Dev=%u Func=%u 64bit%c 133MHz%c SCD%c USC%c, DC=%s, DMMRBC=%u, DMOST=%u, DMCRS=%u, RSCEM%c", + printf("\t\tStatus: Bus=%u Dev=%u Func=%u 64bit%c 133MHz%c SCD%c USC%c, DC=%s, DMMRBC=%u, DMOST=%u, DMCRS=%u, RSCEM%c\n", ((status >> 8) & 0xffU), // bus ((status >> 3) & 0x1fU), // dev (status & PCI_PCIX_STATUS_FUNCTION), // function @@ -904,7 +904,7 @@ show_verbose(struct device *d) putchar(')'); } if (cache_line) - printf(", cache line size %02x", cache_line); + printf(", Cache Line Size %02x", cache_line); putchar('\n'); } if (int_pin || irq) -- 2.39.2