Released as 3.1.5.

[pciutils.git] / lspci.c

diff --git a/lspci.c b/lspci.c
index 5456c5a8acfb0d7992f37262249cd108c233ac61..54317cf5002f3395b8fad76ca0ce87bc88dfafa5 100644 (file)
--- a/lspci.c
+++ b/lspci.c
@@ -330,18 +330,16 @@ show_terse(struct device *d)
 static void
 show_size(pciaddr_t x)
 {
+  static const char suffix[][2] = { "", "K", "M", "G", "T" };
+  unsigned i;
   if (!x)
     return;
-  printf(" [size=");
-  if (x < 1024)
-    printf("%d", (int) x);
-  else if (x < 1048576)
-    printf("%dK", (int)(x / 1024));
-  else if (x < 0x80000000)
-    printf("%dM", (int)(x / 1048576));
-  else
-    printf(PCIADDR_T_FMT, x);
-  putchar(']');
+  for (i = 0; i < (sizeof(suffix) / sizeof(*suffix) - 1); i++) {
+    if (x < 1024)
+      break;
+    x /= 1024;
+  }
+  printf(" [size=%u%s]", (unsigned)x, suffix[i]);
 }
 
 static void
@@ -350,6 +348,7 @@ show_bases(struct device *d, int cnt)
   struct pci_dev *p = d->dev;
   word cmd = get_conf_word(d, PCI_COMMAND);
   int i;
+  int virtual = 0;
 
   for (i=0; i<cnt; i++)
     {
@@ -368,6 +367,7 @@ show_bases(struct device *d, int cnt)
        {
          printf("[virtual] ");
          flg = pos;
+         virtual = 1;
        }
       if (flg & PCI_BASE_ADDRESS_SPACE_IO)
        {
@@ -379,7 +379,7 @@ show_bases(struct device *d, int cnt)
            printf("<ignored>");
          else
            printf("<unassigned>");
-         if (!(cmd & PCI_COMMAND_IO))
+         if (!virtual && !(cmd & PCI_COMMAND_IO))
            printf(" [disabled]");
        }
       else
@@ -415,7 +415,7 @@ show_bases(struct device *d, int cnt)
                 (t == PCI_BASE_ADDRESS_MEM_TYPE_64) ? "64-bit" :
                 (t == PCI_BASE_ADDRESS_MEM_TYPE_1M) ? "low-1M" : "type 3",
                 (flg & PCI_BASE_ADDRESS_MEM_PREFETCH) ? "" : "non-");
-         if (!(cmd & PCI_COMMAND_MEMORY))
+         if (!virtual && !(cmd & PCI_COMMAND_MEMORY))
            printf(" [disabled]");
        }
       show_size(len);
@@ -431,6 +431,7 @@ show_rom(struct device *d, int reg)
   pciaddr_t len = (p->known_fields & PCI_FILL_SIZES) ? p->rom_size : 0;
   u32 flg = get_conf_long(d, reg);
   word cmd = get_conf_word(d, PCI_COMMAND);
+  int virtual = 0;
 
   if (!rom && !flg && !len)
     return;
@@ -439,6 +440,7 @@ show_rom(struct device *d, int reg)
     {
       printf("[virtual] ");
       flg = rom;
+      virtual = 1;
     }
   printf("Expansion ROM at ");
   if (rom & PCI_ROM_ADDRESS_MASK)
@@ -449,7 +451,7 @@ show_rom(struct device *d, int reg)
     printf("<unassigned>");
   if (!(flg & PCI_ROM_ADDRESS_ENABLE))
     printf(" [disabled]");
-  else if (!(cmd & PCI_COMMAND_MEMORY))
+  else if (!virtual && !(cmd & PCI_COMMAND_MEMORY))
     printf(" [disabled by cmd]");
   show_size(len);
   putchar('\n');