From 40116f53dd579aeace561b0b5948769a64ca83da Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 15 May 2002 18:39:47 +0000
Subject: [PATCH] Put back __PCI_BUS_DEVORDER for now.

---
 sys/dev/pci/pci.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 967a0d149c95..a3eb7e241746 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci.c,v 1.59 2002/05/15 18:13:00 thorpej Exp $	*/
+/*	$NetBSD: pci.c,v 1.60 2002/05/15 18:39:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.59 2002/05/15 18:13:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.60 2002/05/15 18:39:47 thorpej Exp $");
 
 #include "opt_pci.h"
 
@@ -407,8 +407,18 @@ pci_enumerate_bus_generic(struct pci_softc *sc,
 	const struct pci_quirkdata *qd;
 	pcireg_t id, bhlcr;
 	pcitag_t tag;
+#ifdef __PCI_BUS_DEVORDER
+	char devs[32];
+	int i;
+#endif
 
-	for (device = 0; device < sc->sc_maxndevs; device++) {
+#ifdef __PCI_BUS_DEVORDER
+	pci_bus_devorder(sc->sc_pc, sc->sc_bus, devs);
+	for (i = 0; (device = devs[i]) < 32 && device >= 0; i++)
+#else
+	for (device = 0; device < sc->sc_maxndevs; device++)
+#endif
+	{
 		tag = pci_make_tag(pc, sc->sc_bus, device, 0);
 		id = pci_conf_read(pc, tag, PCI_ID_REG);