[src/netbsd-1-5]: src/sys/dev/pci Pull up rev 1.45: bugfix for Texas Instrume...

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

details:   https://anonhg.NetBSD.org/src/rev/f7565bcc5ce0
branches:  netbsd-1-5
changeset: 489405:f7565bcc5ce0
user:      haya <haya%NetBSD.org@localhost>
date:      Fri Sep 08 00:43:56 2000 +0000

description:
Pull up rev 1.45: bugfix for Texas Instruments PCI113X.  This pullup
fixes that the bridge does not propagate any interrupt signals when a
card is inserted or removed.

This pullup is approved by <thorpej%netbsd.org@localhost>.

diffstat:

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

diffs (35 lines):

diff -r 3b0b6fde97f4 -r f7565bcc5ce0 sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Thu Sep 07 14:52:32 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Fri Sep 08 00:43:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.42.2.1 2000/07/12 21:45:34 jhawk Exp $     */
+/*     $NetBSD: pccbb.c,v 1.42.2.2 2000/09/08 00:43:56 haya Exp $      */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -755,8 +755,8 @@
                reg |= PCI113X_CBCTRL_PCI_IRQ_ENA;
                /* CSC intr enable */
                reg |= PCI113X_CBCTRL_PCI_CSC;
-               /* functional intr prohibit */
-               reg &= ~PCI113X_CBCTRL_PCI_INTR;
+               /* functional intr prohibit | prohibit ISA routing */
+               reg &= ~(PCI113X_CBCTRL_PCI_INTR | PCI113X_CBCTRL_INT_MASK);
                pci_conf_write(pc, tag, PCI_CBCTRL, reg);
                break;
 
@@ -830,8 +830,12 @@
         * 4) Clear any pending CSC interrupt.
         */
        Pcic_write(ph, PCIC_INTR, PCIC_INTR_ENABLE | PCIC_INTR_RESET);
-       Pcic_write(ph, PCIC_CSC_INTR, PCIC_CSC_INTR_CD_ENABLE);
-       Pcic_read(ph, PCIC_CSC);
+       if (sc->sc_chipset == CB_TI113X) {
+               Pcic_write(ph, PCIC_CSC_INTR, 0);
+       } else {
+               Pcic_write(ph, PCIC_CSC_INTR, PCIC_CSC_INTR_CD_ENABLE);
+               Pcic_read(ph, PCIC_CSC);
+       }
 
        /* initialize pcmcia bus attachment */
        paa->paa_busname = "pcmcia";