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

diff --git a/ChangeLog b/ChangeLog
index 3527b7ad72444b82916669f2ec996742cd041334..ffe9dbd7b8b2749061af63f4901dc2d6f759619d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 2003-12-27  Martin Mares  <mj@ucw.cz>
 
+       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  <mj@ucw.cz>
 

diff --git a/lspci.c b/lspci.c
index 6bdcf38f33dc281c609389f0232891ce95895b26..8bd628d5baa4f64b4d714680fab0a2cd623714a2 100644 (file)
--- 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)