[src/netbsd-1-5]: src/sys/dev/pci Pull up 1.79, approved by thorpej:

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

details:   https://anonhg.NetBSD.org/src/rev/62f491e27b11
branches:  netbsd-1-5
changeset: 488578:62f491e27b11
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Jul 19 12:29:25 2000 +0000

description:
Pull up 1.79, approved by thorpej:
Use the CMD PCI0648/9 IRQ ACK code for the 0646 too, makes the 0646 works
in native mode.

diffstat:

 sys/dev/pci/pciide.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 87ee9326e8cc -r 62f491e27b11 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Wed Jul 19 06:34:22 2000 +0000
+++ b/sys/dev/pci/pciide.c      Wed Jul 19 12:29:25 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.6 2000/07/07 11:49:14 bouyer Exp $   */
+/*     $NetBSD: pciide.c,v 1.68.2.7 2000/07/19 12:29:25 bouyer Exp $   */
 
 
 /*
@@ -172,7 +172,7 @@
 void cmd_channel_map __P((struct pci_attach_args *,
                        struct pciide_softc *, int));
 int  cmd_pci_intr __P((void *));
-void cmd648_9_irqack __P((struct channel_softc *));
+void cmd646_9_irqack __P((struct channel_softc *));
 
 void cy693_chip_map __P((struct pciide_softc*, struct pci_attach_args*));
 void cy693_setup_channel __P((struct channel_softc*));
@@ -2195,7 +2195,8 @@
                case PCI_PRODUCT_CMDTECH_648:
                        sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
                        sc->sc_wdcdev.UDMA_cap = 4;
-                       sc->sc_wdcdev.irqack = cmd648_9_irqack;
+               case PCI_PRODUCT_CMDTECH_646:
+                       sc->sc_wdcdev.irqack = cmd646_9_irqack;
                        break;
                default:
                        sc->sc_wdcdev.irqack = pciide_irqack;
@@ -2308,7 +2309,7 @@
 }
 
 void
-cmd648_9_irqack(chp)
+cmd646_9_irqack(chp)
        struct channel_softc *chp;
 {
        u_int32_t priirq, secirq;