[src/trunk]: src/sys/dev/pci Move struct ppb_softc into ppbvar.h.

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

details:   https://anonhg.NetBSD.org/src/rev/cb44a3e4d018
branches:  trunk
changeset: 822747:cb44a3e4d018
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Apr 05 03:51:36 2017 +0000

description:
Move struct ppb_softc into ppbvar.h.

diffstat:

 sys/dev/pci/ppb.c    |  13 +++----------
 sys/dev/pci/ppbvar.h |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 10 deletions(-)

diffs (96 lines):

diff -r 544c0b59e364 -r cb44a3e4d018 sys/dev/pci/ppb.c
--- a/sys/dev/pci/ppb.c Wed Apr 05 03:47:51 2017 +0000
+++ b/sys/dev/pci/ppb.c Wed Apr 05 03:51:36 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppb.c,v 1.55 2015/11/16 09:10:58 msaitoh Exp $ */
+/*     $NetBSD: ppb.c,v 1.56 2017/04/05 03:51:36 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.55 2015/11/16 09:10:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.56 2017/04/05 03:51:36 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,20 +41,13 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/ppbreg.h>
+#include <dev/pci/ppbvar.h>
 #include <dev/pci/pcidevs.h>
 
 #define        PCIE_SLCSR_NOTIFY_MASK                                  \
        (PCIE_SLCSR_ABE | PCIE_SLCSR_PFE | PCIE_SLCSR_MSE |     \
         PCIE_SLCSR_PDE | PCIE_SLCSR_CCE | PCIE_SLCSR_HPE)
 
-struct ppb_softc {
-       device_t sc_dev;                /* generic device glue */
-       pci_chipset_tag_t sc_pc;        /* our PCI chipset... */
-       pcitag_t sc_tag;                /* ...and tag. */
-
-       pcireg_t sc_pciconfext[48];
-};
-
 static const char pcie_linkspeed_strings[4][5] = {
        "1.25", "2.5", "5.0", "8.0",
 };
diff -r 544c0b59e364 -r cb44a3e4d018 sys/dev/pci/ppbvar.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/pci/ppbvar.h      Wed Apr 05 03:51:36 2017 +0000
@@ -0,0 +1,52 @@
+/*     $NetBSD: ppbvar.h,v 1.1 2017/04/05 03:51:36 msaitoh Exp $       */
+
+/*
+ * Copyright (c) 1996, 1998 Christopher G. Demetriou.  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 Christopher G. Demetriou
+ *     for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: ppbvar.h,v 1.1 2017/04/05 03:51:36 msaitoh Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/ppbreg.h>
+#include <dev/pci/pcidevs.h>
+
+struct ppb_softc {
+       device_t sc_dev;                /* generic device glue */
+       pci_chipset_tag_t sc_pc;        /* our PCI chipset... */
+       pcitag_t sc_tag;                /* ...and tag. */
+
+       pcireg_t sc_pciconfext[48];
+};