X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fgeneric.c;h=c2195924b03dfe86ded37ca990dff17c988532e9;hb=d9b1b8e350adbaf97713ce50b044f1c63d6a98cf;hp=b1b1c8ed01a32e329d8681beec4038125f2697e1;hpb=c2b144efd9a82291ca7b1bb4f561f427ff18ed7e;p=pciutils.git

diff --git a/lib/generic.c b/lib/generic.c
index b1b1c8e..c219592 100644
--- a/lib/generic.c
+++ b/lib/generic.c
@@ -25,11 +25,11 @@ pci_generic_scan_bus(struct pci_access *a, byte *busmap, int bus)
   busmap[bus] = 1;
   t = pci_alloc_dev(a);
   t->bus = bus;
-  for(dev=0; dev<32; dev++)
+  for (dev=0; dev<32; dev++)
     {
       t->dev = dev;
       multi = 0;
-      for(t->func=0; !t->func || multi && t->func<8; t->func++)
+      for (t->func=0; !t->func || multi && t->func<8; t->func++)
 	{
 	  u32 vd = pci_read_long(t, PCI_VENDOR_ID);
 	  struct pci_dev *d;
@@ -70,7 +70,7 @@ pci_generic_scan(struct pci_access *a)
 {
   byte busmap[256];
 
-  bzero(busmap, sizeof(busmap));
+  memset(busmap, 0, sizeof(busmap));
   pci_generic_scan_bus(a, busmap, 0);
 }
 
@@ -93,7 +93,7 @@ pci_generic_fill_info(struct pci_dev *d, int flags)
   if (flags & PCI_FILL_BASES)
     {
       int cnt = 0, i;
-      bzero(d->base_addr, sizeof(d->base_addr));
+      memset(d->base_addr, 0, sizeof(d->base_addr));
       switch (d->hdrtype)
 	{
 	case PCI_HEADER_TYPE_NORMAL:
@@ -108,7 +108,7 @@ pci_generic_fill_info(struct pci_dev *d, int flags)
 	}
       if (cnt)
 	{
-	  for(i=0; i<cnt; i++)
+	  for (i=0; i<cnt; i++)
 	    {
 	      u32 x = pci_read_long(d, PCI_BASE_ADDRESS_0 + i*4);
 	      if (!x || x == (u32) ~0)
@@ -157,6 +157,8 @@ pci_generic_fill_info(struct pci_dev *d, int flags)
 	    d->rom_base_addr = u;
 	}
     }
+  if (flags & (PCI_FILL_CAPS | PCI_FILL_EXT_CAPS))
+    flags |= pci_scan_caps(d, flags);
   return flags & ~PCI_FILL_SIZES;
 }