[src/netbsd-1-4]: src/sys/dev/pci Pull up revision 1.79 (requested by bouyer):

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

details:   https://anonhg.NetBSD.org/src/rev/9bc3b7fcdd06
branches:  netbsd-1-4
changeset: 470797:9bc3b7fcdd06
user:      he <he%NetBSD.org@localhost>
date:      Sun Jul 23 17:31:54 2000 +0000

description:
Pull up revision 1.79 (requested by bouyer):
  Handle CMD PCI0646 interrupts as for the PCI0648; makes the
  PCI0646 work in native mode with shared interrupts.

diffstat:

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

diffs (37 lines):

diff -r 7574fd83ceeb -r 9bc3b7fcdd06 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Sun Jul 23 17:29:57 2000 +0000
+++ b/sys/dev/pci/pciide.c      Sun Jul 23 17:31:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.33.2.6 2000/07/23 17:29:08 he Exp $       */
+/*     $NetBSD: pciide.c,v 1.33.2.7 2000/07/23 17:31:54 he Exp $       */
 
 
 /*
@@ -184,7 +184,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*));
@@ -2193,7 +2193,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;
@@ -2306,7 +2307,7 @@
 }
 
 void
-cmd648_9_irqack(chp)
+cmd646_9_irqack(chp)
        struct channel_softc *chp;
 {
        u_int32_t priirq, secirq;