diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-03-11 22:08:08 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-03-11 22:08:08 +0000 |
| commit | ad743ae786746e4bd8f93f6afa2caff7bce0442a (patch) | |
| tree | 4773a9a397148a057156751f4dc366683b3674df | |
| parent | 40d04c27277f9880cf0e67c7a05122dd74728c26 (diff) | |
move PCI softc struct from pci.c to pcivar.h
ok krw@ kettenis@
| -rw-r--r-- | sys/dev/pci/pci.c | 12 | ||||
| -rw-r--r-- | sys/dev/pci/pcivar.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 61ffab556a8..24477ece9cb 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.39 2005/07/10 19:03:09 mickey Exp $ */ +/* $OpenBSD: pci.c,v 1.40 2006/03/11 22:08:07 brad Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -48,16 +48,6 @@ int pcimatch(struct device *, void *, void *); void pciattach(struct device *, struct device *, void *); void pcipower(int, void *); -struct pci_softc { - struct device sc_dev; - pci_chipset_tag_t sc_pc; - void *sc_powerhook; - LIST_HEAD(, pci_dev) sc_devs; -#ifdef USER_PCICONF - int sc_bus; /* PCI configuration space bus # */ -#endif -}; - #define NMAPREG ((PCI_MAPREG_END - PCI_MAPREG_START) / \ sizeof(pcireg_t)) struct pci_dev { diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 8eb6ef58092..9aa4858e92d 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcivar.h,v 1.42 2005/06/29 03:53:28 brad Exp $ */ +/* $OpenBSD: pcivar.h,v 1.43 2006/03/11 22:08:07 brad Exp $ */ /* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -42,6 +42,7 @@ * provided by pci_machdep.h. */ +#include <sys/device.h> #include <machine/bus.h> #include <dev/pci/pcireg.h> @@ -50,6 +51,7 @@ */ typedef u_int32_t pcireg_t; /* configuration space register XXX */ struct pcibus_attach_args; +struct pci_softc; /* * Machine-dependent definitions. @@ -141,6 +143,14 @@ struct pci_quirkdata { }; #define PCI_QUIRK_MULTIFUNCTION 0x00000001 +struct pci_softc { + struct device sc_dev; + pci_chipset_tag_t sc_pc; + void *sc_powerhook; + LIST_HEAD(, pci_dev) sc_devs; + int sc_bus; +}; + /* * Locators devices that attach to 'pcibus', as specified to config. */ |