summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2000-05-04 05:35:46 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2000-05-04 05:35:46 +0000
commit83b1fe8265c0f8699e6744ddf7fb956417792b7d (patch)
treeabf6371ae7dfa69905ceef7ae529969475ea647f
parentdcc2402628f49dfe08d36a013ffa8c1d56caa53a (diff)
assume all pchb made by ServerWorks act the same
-rw-r--r--sys/arch/i386/pci/pchb.c42
1 files changed, 17 insertions, 25 deletions
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index a9c26b1a5f6..49b1cf58caa 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.12 2000/05/01 19:34:22 deraadt Exp $ */
+/* $OpenBSD: pchb.c,v 1.13 2000/05/04 05:35:45 deraadt Exp $ */
/* $NetBSD: pchb.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */
/*
@@ -164,31 +164,23 @@ pchbattach(parent, self, aux)
switch (PCI_VENDOR(pa->pa_id)) {
case PCI_VENDOR_RCC:
- switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_RCC_ROSB4:
- case PCI_PRODUCT_RCC_CNB20HE:
- case PCI_PRODUCT_RCC_CNB20LE:
- case PCI_PRODUCT_RCC_CMIC_HE:
- bdnum = pci_conf_read(pa->pa_pc, pa->pa_tag,
- 0x44);
-
- if (bdnum == 0)
- break;
- /*
- * This host bridge has a second PCI bus.
- * Configure it.
- */
- printf(": has pci bus %d\n", bdnum);
- neednl = 0;
- pba.pba_busname = "pci";
- pba.pba_iot = pa->pa_iot;
- pba.pba_memt = pa->pa_memt;
- pba.pba_dmat = pa->pa_dmat;
- pba.pba_bus = bdnum;
- pba.pba_pc = pa->pa_pc;
- config_found(self, &pba, pchb_print);
+ bdnum = pci_conf_read(pa->pa_pc, pa->pa_tag, 0x44);
+
+ if (bdnum == 0)
break;
- }
+ /*
+ * This host bridge has a second PCI bus.
+ * Configure it.
+ */
+ printf("\n");
+ neednl = 0;
+ pba.pba_busname = "pci";
+ pba.pba_iot = pa->pa_iot;
+ pba.pba_memt = pa->pa_memt;
+ pba.pba_dmat = pa->pa_dmat;
+ pba.pba_bus = bdnum;
+ pba.pba_pc = pa->pa_pc;
+ config_found(self, &pba, pchb_print);
break;
case PCI_VENDOR_INTEL:
switch (PCI_PRODUCT(pa->pa_id)) {