diff options
| author | zbb <zbb@FreeBSD.org> | 2016-02-20 12:28:20 +0000 |
|---|---|---|
| committer | zbb <zbb@FreeBSD.org> | 2016-02-20 12:28:20 +0000 |
| commit | e9cf712fdabf0a3b6b3e8e1e7f239a4e1c4e2d1f (patch) | |
| tree | b685f4faf94a7b21d8c2fb3b751b8923b30b1a9b /sys/powerpc/powermac | |
| parent | 33ef68fedb3270f37fc4d216f733431e0e22f138 (diff) | |
| download | FreeBSD-src-e9cf712fdabf0a3b6b3e8e1e7f239a4e1c4e2d1f.zip FreeBSD-src-e9cf712fdabf0a3b6b3e8e1e7f239a4e1c4e2d1f.tar.gz | |
Revert r295756:
Extract common code from PowerPC's ofw_pci
Import portions of the PowerPC OF PCI implementation into
new file "ofw_pci.c", common for other platforms. The files ofw_pci.c and
ofw_pci.h from sys/powerpc/ofw no longer exist. All required declarations
are moved to sys/dev/ofw/ofw_pci.h.
This creates a new ofw_pci_write_ivar() function and modifies
ofw_pci_nranges(), ofw_pci_read_ivar(), ofw_pci_route_interrupt()
methods.
Most functions contain existing ppc implementations in the majority
unchanged. Now there is no need to have multiple identical copies
of methods for various architectures.
Submitted by: Marcin Mazurek <mma@semihalf.com>
Obtained from: Semihalf
Sponsored by: Annapurna Labs
Reviewed by: jhibbits, mmel
Differential Revision: https://reviews.freebsd.org/D4879
This needs to return to the drawing board as it breaks both
PowerPC and Sparc64 build.
Pointed out by: jhibbits
Diffstat (limited to 'sys/powerpc/powermac')
| -rw-r--r-- | sys/powerpc/powermac/cpcht.c | 3 | ||||
| -rw-r--r-- | sys/powerpc/powermac/grackle.c | 3 | ||||
| -rw-r--r-- | sys/powerpc/powermac/uninorthpci.c | 3 | ||||
| -rw-r--r-- | sys/powerpc/powermac/uninorthvar.h | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index 737e872..765d946 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <dev/ofw/openfirm.h> +#include <dev/ofw/ofw_pci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -50,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/ofw/ofw_pci.h> +#include <powerpc/ofw/ofw_pci.h> #include <vm/vm.h> #include <vm/pmap.h> diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index f0928f3..95d59a1 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -37,9 +37,9 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <dev/ofw/openfirm.h> +#include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/ofw/ofw_pci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> +#include <powerpc/ofw/ofw_pci.h> #include <powerpc/powermac/gracklevar.h> #include <vm/vm.h> diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c index 5cb21c1..9da06ff 100644 --- a/sys/powerpc/powermac/uninorthpci.c +++ b/sys/powerpc/powermac/uninorthpci.c @@ -34,9 +34,9 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <dev/ofw/openfirm.h> +#include <dev/ofw/ofw_pci.h> #include <dev/ofw/ofw_bus.h> #include <dev/ofw/ofw_bus_subr.h> -#include <dev/ofw/ofw_pci.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> @@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> +#include <powerpc/ofw/ofw_pci.h> #include <powerpc/powermac/uninorthvar.h> #include <vm/vm.h> diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h index efe169c..e08478d 100644 --- a/sys/powerpc/powermac/uninorthvar.h +++ b/sys/powerpc/powermac/uninorthvar.h @@ -30,6 +30,7 @@ #include <dev/ofw/ofw_bus_subr.h> #include <dev/ofw/ofw_pci.h> +#include <powerpc/ofw/ofw_pci.h> struct uninorth_softc { struct ofw_pci_softc pci_sc; |
