[src/netbsd-2]: src/sys/dev/pci Pull up following revision(s) (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/fa98841658ce
branches:  netbsd-2
changeset: 563988:fa98841658ce
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Aug 22 21:55:01 2005 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #5602):
        sys/dev/pci/piixide.c: revision 1.24
Not all PIIX are wired to compat mode these days. Problem reported and fix
tested by Havard Eidnes.

diffstat:

 sys/dev/pci/piixide.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 3185b5f90812 -r fa98841658ce sys/dev/pci/piixide.c
--- a/sys/dev/pci/piixide.c     Mon Aug 22 21:46:33 2005 +0000
+++ b/sys/dev/pci/piixide.c     Mon Aug 22 21:55:01 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: piixide.c,v 1.8.2.1.2.3 2005/06/21 23:04:51 riz Exp $  */
+/*     $NetBSD: piixide.c,v 1.8.2.1.2.4 2005/08/22 21:55:01 riz Exp $  */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -200,6 +200,7 @@
        int channel;
        u_int32_t idetim;
        bus_size_t cmdsize, ctlsize;
+       pcireg_t interface = PCI_INTERFACE(pa->pa_class);
 
        if (pciide_chipen(sc, pa) == 0)
                return;
@@ -290,8 +291,7 @@
 
        for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) {
                cp = &sc->pciide_channels[channel];
-               /* PIIX is compat-only */
-               if (pciide_chansetup(sc, channel, 0) == 0)
+               if (pciide_chansetup(sc, channel, interface) == 0)
                        continue;
                idetim = pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_IDETIM);
                if ((PIIX_IDETIM_READ(idetim, channel) &
@@ -314,8 +314,8 @@
                            channel, idetim, interface);
 #endif
                }
-               /* PIIX are compat-only pciide devices */
-               pciide_mapchan(pa, cp, 0, &cmdsize, &ctlsize, pciide_pci_intr);
+               pciide_mapchan(pa, cp, interface,
+                   &cmdsize, &ctlsize, pciide_pci_intr);
        }
 
        WDCDEBUG_PRINT(("piix_setup_chip: idetim=0x%x",