[src/trunk]: src/sys/dev/pci Move chip version check from advlib.c to adv_pci.c

[dante <dante%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/571de1d4136d
branches:  trunk
changeset: 473648:571de1d4136d
user:      dante <dante%NetBSD.org@localhost>
date:      Sat Jun 12 12:09:58 1999 +0000

description:
Move chip version check from advlib.c to adv_pci.c

diffstat:

 sys/dev/pci/adv_pci.c |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r c72f610d4526 -r 571de1d4136d sys/dev/pci/adv_pci.c
--- a/sys/dev/pci/adv_pci.c     Sat Jun 12 12:09:01 1999 +0000
+++ b/sys/dev/pci/adv_pci.c     Sat Jun 12 12:09:58 1999 +0000
@@ -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 @@
                        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 @@
                       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