[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.156 (requested by bouyer...

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

details:   https://anonhg.NetBSD.org/src/rev/f9283a0c8f69
branches:  netbsd-1-6
changeset: 527822:f9283a0c8f69
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Jun 10 16:23:56 2002 +0000

description:
Pull up revision 1.156 (requested by bouyer in ticket #214):
Ops, use the proper setup_channel() function for promise adapters.
Using pdc202xx_setup_channel() for PDC20268 and newer is wrong, and will
cause trap trying to read from a non-existent register on some arches
(e.g. macppc).
pointed out by Makoto Fujiwara on port-macppc.

diffstat:

 sys/dev/pci/pciide.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 51f76ad5321c -r f9283a0c8f69 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Mon Jun 10 16:22:34 2002 +0000
+++ b/sys/dev/pci/pciide.c      Mon Jun 10 16:23:56 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.153.2.1 2002/06/04 11:11:59 lukem Exp $   */
+/*     $NetBSD: pciide.c,v 1.153.2.2 2002/06/10 16:23:56 tv Exp $      */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.1 2002/06/04 11:11:59 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.153.2.2 2002/06/10 16:23:56 tv Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -3613,7 +3613,7 @@
                        st &= ~(PDC_IS_262(sc) ?
                            PDC262_STATE_EN(channel):PDC246_STATE_EN(channel));
                pciide_map_compat_intr(pa, cp, channel, interface);
-               pdc202xx_setup_channel(&cp->wdc_channel);
+               sc->sc_wdcdev.set_modes(&cp->wdc_channel);
        }
        if (!PDC_IS_268(sc)) {
                WDCDEBUG_PRINT(("pdc202xx_setup_chip: new controller state "