diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2017-04-05 03:51:36 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2017-04-05 03:51:36 +0000 |
| commit | 87718b62df55eaaeafbaa9236b68f47d46f45fa5 (patch) | |
| tree | 396a3bf76be840552f6a178f6d3978c360621e3e /sys | |
| parent | 8abff30a3fd83ebd64a7bacdaade3c1f2d128562 (diff) | |
Move struct ppb_softc into ppbvar.h.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/ppb.c | 13 | ||||
| -rw-r--r-- | sys/dev/pci/ppbvar.h | 52 |
2 files changed, 55 insertions, 10 deletions
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index c78bc78bc04..a48a2ff9389 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.55 2015/11/16 09:10:58 msaitoh Exp $"); #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 --git a/sys/dev/pci/ppbvar.h b/sys/dev/pci/ppbvar.h new file mode 100644 index 00000000000..9eed4e9fc4f --- /dev/null +++ b/sys/dev/pci/ppbvar.h @@ -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]; +}; |
