[src/netbsd-1-5]: src/sys/dev/isa Pull up rev 1.16 (approved by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/ca051a241546
branches:  netbsd-1-5
changeset: 489665:ca051a241546
user:      simonb <simonb%NetBSD.org@localhost>
date:      Wed Oct 04 04:14:10 2000 +0000

description:
Pull up rev 1.16 (approved by thorpej):
 Revert rev 1.31 of bha.c (and associtated changes in the headers and
 config glue files).

 Fixes PR kern/9841.  Tested by Tracy J. Di Marco White with a bt948
 and 6 disks.

diffstat:

 sys/dev/isa/bha_isa.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 66b3e6fa6158 -r ca051a241546 sys/dev/isa/bha_isa.c
--- a/sys/dev/isa/bha_isa.c     Wed Oct 04 04:13:32 2000 +0000
+++ b/sys/dev/isa/bha_isa.c     Wed Oct 04 04:14:10 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bha_isa.c,v 1.15 1999/10/01 18:17:12 thorpej Exp $     */
+/*     $NetBSD: bha_isa.c,v 1.15.12.1 2000/10/04 04:14:10 simonb Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
                 * we can do 32-bit DMA (earlier revisions are buggy
                 * in this regard).
                 */
-               (void) bha_info(sc);
+               bha_inquire_setup_information(sc);
                if (strcmp(sc->sc_firmware, "3.37") < 0)
                    printf("%s: buggy VLB controller, disabling 32-bit DMA\n",
                        sc->sc_dev.dv_xname);