diff --git a/sys/dev/ic/i82557var.h b/sys/dev/ic/i82557var.h index 0d55550ca23b..03aa1ca7b30d 100644 --- a/sys/dev/ic/i82557var.h +++ b/sys/dev/ic/i82557var.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82557var.h,v 1.12 2000/03/23 07:01:31 thorpej Exp $ */ +/* $NetBSD: i82557var.h,v 1.13 2000/05/12 03:36:19 jhawk Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -162,7 +162,6 @@ struct fxp_softc { struct ethercom sc_ethercom; /* ethernet common part */ void *sc_sdhook; /* shutdown hook */ void *sc_powerhook; /* power hook */ - void *sc_ih; /* interrupt handler cookie */ struct mii_data sc_mii; /* MII/media information */ struct callout sc_callout; /* MII callout */ diff --git a/sys/dev/pci/if_fxp_pcivar.h b/sys/dev/pci/if_fxp_pcivar.h new file mode 100644 index 000000000000..a5b7f3cf47c4 --- /dev/null +++ b/sys/dev/pci/if_fxp_pcivar.h @@ -0,0 +1,49 @@ +/* $NetBSD: if_fxp_pcivar.h,v 1.1 2000/05/12 03:36:18 jhawk Exp $ */ + +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the NetBSD + * Foundation, Inc. and its contributors. + * 4. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DEV_PCI_IF_FXP_PCIVAR_H_ +#define _DEV_PCI_IF_FXP_PCIVAR_H_ + +struct fxp_pci_softc { + struct fxp_softc psc_fxp; + + 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 */ +}; + +#endif