Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
jhawk 2000-05-12 18:46:33 +00:00
parent 4d8aac4dbb
commit e0292df01c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/ic/i82557var.h
View File

@ -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 @@ struct fxp_softc {
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 */

7
sys/dev/pci/if_fxp_pci.c
View File

@ -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 @@ struct fxp_pci_softc {
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 @@ fxp_pci_attach(parent, self, aux)
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)