- Rename PCIx_HEADERTYPE* to PCIx_HDRTYPE* so the constants aren't so long.

- Add a new PCIM_HDRTYPE constant for the field in PCIR_HDRTYPE that holds
  the header type.
- Replace several magic numbers with appropriate constants for the header
  type register and a couple of PCI_FUNCMAX.
- Merge to amd64 the fix to the i386 bridge code to skip devices with
  unknown header types.

Requested by:	imp (1, 2)

1 files changed, 3 insertions, 3 deletions

diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 3346a8d..2a1dc2f 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -322,18 +322,18 @@ legacy_pcib_identify(driver_t *driver, device_t parent)
 	for (slot = 0; slot <= PCI_SLOTMAX; slot++) {
 		func = 0;
 		hdrtype = legacy_pcib_read_config(0, bus, slot, func,
-						 PCIR_HEADERTYPE, 1);
+						 PCIR_HDRTYPE, 1);
 		/*
 		 * When enumerating bus devices, the standard says that
 		 * one should check the header type and ignore the slots whose
 		 * header types that the software doesn't know about.  We use
 		 * this to filter out devices.
 		 */
-		if ((hdrtype & ~PCIM_MFDEV) > PCI_MAXHDRTYPE)
+		if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE)
 			continue;
 		if ((hdrtype & PCIM_MFDEV) && 
 		    (!found_orion || hdrtype != 0xff))
-			pcifunchigh = 7;
+			pcifunchigh = PCI_FUNCMAX;
 		else
 			pcifunchigh = 0;
 		for (func = 0; func <= pcifunchigh; func++) {