[src/trunk]: src/sys/dev/pci Move struct fxp_pci_softc declaration to if_fxp_...

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

details:   https://anonhg.NetBSD.org/src/rev/7c85af36ccbb
branches:  trunk
changeset: 486058:7c85af36ccbb
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Fri May 12 13:46:31 2000 +0000

description:
Move struct fxp_pci_softc declaration to if_fxp_pci.c removing an
unnecessary header file (if_fxp_pcivar.h); oh, how quickly the nascent
inodes are subject to infant mortality.

diffstat:

 sys/dev/pci/if_fxp_pci.c    |  12 +++++++++-
 sys/dev/pci/if_fxp_pcivar.h |  49 ---------------------------------------------
 2 files changed, 10 insertions(+), 51 deletions(-)

diffs (79 lines):

diff -r f9eb071389d1 -r 7c85af36ccbb sys/dev/pci/if_fxp_pci.c
--- a/sys/dev/pci/if_fxp_pci.c  Fri May 12 06:44:34 2000 +0000
+++ b/sys/dev/pci/if_fxp_pci.c  Fri May 12 13:46:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_fxp_pci.c,v 1.6 2000/05/12 03:37:40 jhawk Exp $     */
+/*     $NetBSD: if_fxp_pci.c,v 1.7 2000/05/12 13:46:32 jhawk Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -94,7 +94,15 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
-#include <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 */
+};
 
 int    fxp_pci_match __P((struct device *, struct cfdata *, void *));
 void   fxp_pci_attach __P((struct device *, struct device *, void *));
diff -r f9eb071389d1 -r 7c85af36ccbb sys/dev/pci/if_fxp_pcivar.h
--- a/sys/dev/pci/if_fxp_pcivar.h       Fri May 12 06:44:34 2000 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*     $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