From 2d2ae58ae59deb33739e4acd3491fef8306ac11b Mon Sep 17 00:00:00 2001
From: Jonathan Lemon <jlemon@FreeBSD.org>
Date: Thu, 24 Jun 1999 04:06:26 +0000
Subject: [PATCH] Allow the Ross host to PCI bridge to appear as a PCI bus. 
 This permits my Compaq 3000 to recognize the secondary bus.

---
 sys/pci/pcisupport.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 644035649c0..ab29e544a98 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.120 1999/06/15 12:01:26 roger Exp $
+**  $Id: pcisupport.c,v 1.121 1999/06/16 12:26:40 billf Exp $
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
@@ -170,9 +170,9 @@ fixbushigh_Ross(device_t dev)
 
 	/* just guessing the secondary bus register number ... */
 	secondarybus = pci_read_config(dev, 0x45, 1);
-	if (secondarybus != 0) {
-		pci_set_secondarybus(dev, secondarybus + 1);
-		pci_set_subordinatebus(dev, secondarybus + 1);
+	if (secondarybus != 0 && secondarybus != 0xff) {
+		pci_set_secondarybus(dev, secondarybus);
+		pci_set_subordinatebus(dev, secondarybus);
 	}
 }
 
@@ -834,6 +834,11 @@ pcib_match(device_t dev)
 		return ("IBM 82351 PCI-PCI bridge");
 	case 0x00011011:
 		return ("DEC 21050 PCI-PCI bridge");
+
+	/* Ross (?) -- vendor 0x1166 */
+	case 0x00051166:
+		fixbushigh_Ross(dev);
+		return ("Ross (?) host to PCI bridge");
 	};
 
 	if (pci_get_class(dev) == PCIC_BRIDGE
@@ -1203,11 +1208,6 @@ chip_match(device_t dev)
 		return ("OPTi 82C861 (FireLink) USB controller");
 #endif
 
-	/* Ross (?) -- vendor 0x1166 */
-	case 0x00051166:
-		fixbushigh_Ross(dev);
-		return ("Ross (?) host to PCI bridge");
-
 	/* NEC -- vendor 0x1033 */
 
 	/* PCI to C-bus bridge */
-- 
2.45.2