[src/trunk]: src/sys/dev sc_ih (interrupt cookie) is not pci-specific data

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

details:   https://anonhg.NetBSD.org/src/rev/ffe84fc3f8a8
branches:  trunk
changeset: 486079:ffe84fc3f8a8
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Fri May 12 18:46:33 2000 +0000

description:
sc_ih (interrupt cookie) is not pci-specific data
and needs to remain in fxp_softc rather than fxp_pci_softc;
otherwise we break cardbus.

diffstat:

 sys/dev/ic/i82557var.h   |  3 ++-
 sys/dev/pci/if_fxp_pci.c |  7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 8e0d84cdcf0b -r ffe84fc3f8a8 sys/dev/ic/i82557var.h
--- a/sys/dev/ic/i82557var.h    Fri May 12 18:31:55 2000 +0000
+++ b/sys/dev/ic/i82557var.h    Fri May 12 18:46:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82557var.h,v 1.13 2000/05/12 03:36:19 jhawk Exp $     */
+/*     $NetBSD: i82557var.h,v 1.14 2000/05/12 18:46:33 jhawk Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -161,6 +161,7 @@
        bus_dma_tag_t sc_dmat;          /* bus dma tag */
        struct ethercom sc_ethercom;    /* ethernet common part */
        void *sc_sdhook;                /* shutdown hook */
+       void *sc_ih;                    /* interrupt handler cookie */
        void *sc_powerhook;             /* power hook */
 
        struct mii_data sc_mii;         /* MII/media information */
diff -r 8e0d84cdcf0b -r ffe84fc3f8a8 sys/dev/pci/if_fxp_pci.c
--- a/sys/dev/pci/if_fxp_pci.c  Fri May 12 18:31:55 2000 +0000
+++ b/sys/dev/pci/if_fxp_pci.c  Fri May 12 18:46:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_pci.c,v 1.7 2000/05/12 13:46:32 jhawk Exp $     */
+/*     $NetBSD: if_fxp_pci.c,v 1.8 2000/05/12 18:46:34 jhawk Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -100,7 +100,6 @@
        pci_chipset_tag_t psc_pc;       /* pci chipset tag */
        pcireg_t psc_regs[0x20>>2];     /* saved PCI config regs (sparse) */
        pcitag_t psc_tag;               /* pci register tag */
-       void *psc_ih;                   /* interrupt handler cookie */
        void *psc_powerhook;            /* power hook */
 };
 
@@ -371,8 +370,8 @@
                return;
        }
        intrstr = pci_intr_string(pc, ih);
-       psc->psc_ih = pci_intr_establish(pc, ih, IPL_NET, fxp_intr, sc);
-       if (psc->psc_ih == NULL) {
+       sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, fxp_intr, sc);
+       if (sc->sc_ih == NULL) {
                printf("%s: couldn't establish interrupt",
                    sc->sc_dev.dv_xname);
                if (intrstr != NULL)