[src/netbsd-3]: src/sys/dev/pci Pull up revision 1.24 (requested by bouyer in...

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

details:   https://anonhg.NetBSD.org/src/rev/902b659381e5
branches:  netbsd-3
changeset: 577035:902b659381e5
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Aug 24 21:51:26 2005 +0000

description:
Pull up revision 1.24 (requested by bouyer in ticket #692):
Not add 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 1a638b1595bf -r 902b659381e5 sys/dev/pci/piixide.c
--- a/sys/dev/pci/piixide.c     Wed Aug 24 21:48:51 2005 +0000
+++ b/sys/dev/pci/piixide.c     Wed Aug 24 21:51:26 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: piixide.c,v 1.19.2.3 2005/07/23 14:51:55 riz Exp $     */
+/*     $NetBSD: piixide.c,v 1.19.2.4 2005/08/24 21:51:26 tron Exp $    */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -243,6 +243,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;
@@ -338,8 +339,7 @@
        for (channel = 0; channel < sc->sc_wdcdev.sc_atac.atac_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) &
@@ -362,8 +362,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);
        }
 
        ATADEBUG_PRINT(("piix_setup_chip: idetim=0x%x",