[src/netbsd-1-4]: src/sys/dev/ic Pull up revision 1.35 (requested by mhitch):

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

details:   https://anonhg.NetBSD.org/src/rev/698f661d2a54
branches:  netbsd-1-4
changeset: 469836:698f661d2a54
user:      he <he%NetBSD.org@localhost>
date:      Sat Dec 04 19:34:13 1999 +0000

description:
Pull up revision 1.35 (requested by mhitch):
  Fix the problems in detecting the clock speed on the TCDS Dual
  SCSI Option cards, and correctly configure the Fast SCSI interfaces.
  This allows installation on the 3000/500 -> 3000/900 Alphas which
  have the Fast SCSI interface on the on-board SCSI adapters.

diffstat:

 sys/dev/ic/ncr53c9x.c |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r accfc2af8434 -r 698f661d2a54 sys/dev/ic/ncr53c9x.c
--- a/sys/dev/ic/ncr53c9x.c     Sat Dec 04 19:29:00 1999 +0000
+++ b/sys/dev/ic/ncr53c9x.c     Sat Dec 04 19:34:13 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr53c9x.c,v 1.34 1999/02/12 00:52:52 thorpej Exp $    */
+/*     $NetBSD: ncr53c9x.c,v 1.34.2.1 1999/12/04 19:34:13 he Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -444,8 +444,14 @@
                         * put the chip in Fast SCSI mode.
                         */
                        if (ti->period <= 50)
-                               cfg3 |= (sc->sc_rev == NCR_VARIANT_AM53C974) ?
-                                   NCRAMDCFG3_FSCSI : NCRCFG3_FSCSI;
+                               /*
+                                * There are (at least) 4 variations of the
+                                * configuration 3 register.  The drive attach
+                                * routine sets the appropriate bit to put the
+                                * chip into Fast SCSI mode so that it doesn't
+                                * have to be figured out here each time.
+                                */
+                               cfg3 |= sc->sc_cfg3_fscsi;
                }
 
                /*