summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authordante <dante@NetBSD.org>1999-06-12 12:09:58 +0000
committerdante <dante@NetBSD.org>1999-06-12 12:09:58 +0000
commit35e149ef50f5e166cd1b8a3df35955751cb6aea1 (patch)
tree5bb09b276f7b44859db3603c1f155d1835c9187b /sys/dev/pci
parentd0fb45fdf354e83c8aa264665cb40648c0b93e96 (diff)
Move chip version check from advlib.c to adv_pci.c
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/adv_pci.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c
index 503d2475ec1..750813acd7f 100644
--- a/sys/dev/pci/adv_pci.c
+++ b/sys/dev/pci/adv_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.6 1999/02/25 20:20:30 dante Exp $ */
+/* $NetBSD: adv_pci.c,v 1.7 1999/06/12 12:09:58 dante Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -193,8 +193,8 @@ adv_pci_attach(parent, self, aux)
bhlcr &= 0xFFFF00FFul;
pci_conf_write(pa->pa_pc, pa->pa_tag,
PCI_BHLC_REG, bhlcr);
- } else if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ADVSYS_ULTRA) &&
- (PCI_LATTIMER(bhlcr) < 0x20)) {
+ } else if ((PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ADVSYS_ULTRA)
+ && (PCI_LATTIMER(bhlcr) < 0x20)) {
bhlcr &= 0xFFFF00FFul;
bhlcr |= 0x00002000ul;
pci_conf_write(pa->pa_pc, pa->pa_tag,
@@ -212,11 +212,16 @@ adv_pci_attach(parent, self, aux)
sc->sc_dev.dv_xname);
return;
}
+
+ ASC_SET_CHIP_CONTROL(iot, ioh, ASC_CC_HALT);
+ ASC_SET_CHIP_STATUS(iot, ioh, 0);
+
sc->sc_iot = iot;
sc->sc_ioh = ioh;
sc->sc_dmat = pa->pa_dmat;
sc->pci_device_id = pa->pa_id;
sc->bus_type = ASC_IS_PCI;
+ sc->chip_version = ASC_GET_CHIP_VER_NO(iot, ioh);
/*
* Initialize the board