diff options
author | marius <marius@FreeBSD.org> | 2007-01-18 13:52:44 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2007-01-18 13:52:44 +0000 |
commit | 52099a4877411d2bc0a06d7c071d7bc464d9cd13 (patch) | |
tree | 71ac6785ddff180620abf3962fda0ccb2e8b23d7 /sys/sparc64/pci | |
parent | 85c3e6d089a47ffbf7d2b8bd714fe07527f3667b (diff) | |
download | FreeBSD-src-52099a4877411d2bc0a06d7c071d7bc464d9cd13.zip FreeBSD-src-52099a4877411d2bc0a06d7c071d7bc464d9cd13.tar.gz |
Remove the compat shims for the ISA old-stlye in{b,w,l}()/out{b,w,l}()
and friends along with all hacks required to implement them. None of
the drivers currently built (as part of GENERIC, LINT or modules) on
sparc64 or sun4v and none of those we might want to use there in
future uses them, AFAICT there actually never was a driver hooked up
to the sparc64 or sun4v build that correctly used these functions
(and it looks like that due to a bug read{b,w,l}()/write{b,w,l}() and
the other functions working on a memory handle never actually worked on
sun4v). All they ever were good for on sparc64 and sun4v was erroneously
dragging in dependencies on isa(4) in drivers like f.e. dpt(4), si(4)
and syscons(4) in source files that supposedly were bus-neutral and
hiding issues with drivers like f.e. ng_bt3c(4) that used these
functions with busses other than isa(4) and therefore couldn't work on
these platforms.
Diffstat (limited to 'sys/sparc64/pci')
-rw-r--r-- | sys/sparc64/pci/ofw_pci_if.m | 21 | ||||
-rw-r--r-- | sys/sparc64/pci/psycho.c | 21 |
2 files changed, 0 insertions, 42 deletions
diff --git a/sys/sparc64/pci/ofw_pci_if.m b/sys/sparc64/pci/ofw_pci_if.m index cd729eb..9e7412a 100644 --- a/sys/sparc64/pci/ofw_pci_if.m +++ b/sys/sparc64/pci/ofw_pci_if.m @@ -25,7 +25,6 @@ # $FreeBSD$ #include <sys/bus.h> -#include <machine/bus.h> #include <dev/ofw/openfirm.h> @@ -35,7 +34,6 @@ INTERFACE ofw_pci; CODE { static ofw_pci_intr_pending_t ofw_pci_default_intr_pending; - static ofw_pci_get_bus_handle_t ofw_pci_default_get_bus_handle; static ofw_pci_adjust_busrange_t ofw_pci_default_adjust_busrange; static int @@ -45,15 +43,6 @@ CODE { return (OFW_PCI_INTR_PENDING(device_get_parent(dev), intr)); } - static bus_space_handle_t - ofw_pci_default_get_bus_handle(device_t dev, int type, - bus_space_handle_t childhdl, bus_space_tag_t *tag) - { - - return (OFW_PCI_GET_BUS_HANDLE(device_get_parent(dev), type, - childhdl, tag)); - } - static void ofw_pci_default_adjust_busrange(device_t dev, u_int busno) { @@ -68,16 +57,6 @@ METHOD int intr_pending { ofw_pci_intr_t intr; } DEFAULT ofw_pci_default_intr_pending; -# Get the bustag for the root bus. This is needed for ISA old-stlye -# in[bwl]()/out[bwl]() support, where no tag retrieved from a resource is -# passed. The returned tag is used to construct a tag for the whole ISA bus. -METHOD bus_space_handle_t get_bus_handle { - device_t dev; - int type; - bus_space_handle_t childhdl; - bus_space_tag_t *tag; -} DEFAULT ofw_pci_default_get_bus_handle; - # Make sure that all PCI bridges up in the hierarchy contain this bus in their # subordinate bus range. This is required because we reenumerate all PCI # buses. diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index 8e20a4b..8e21d3b 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -117,7 +117,6 @@ static pcib_read_config_t psycho_read_config; static pcib_write_config_t psycho_write_config; static pcib_route_interrupt_t psycho_route_interrupt; static ofw_pci_intr_pending_t psycho_intr_pending; -static ofw_pci_get_bus_handle_t psycho_get_bus_handle; static ofw_bus_get_node_t psycho_get_node; static ofw_pci_adjust_busrange_t psycho_adjust_busrange; @@ -150,7 +149,6 @@ static device_method_t psycho_methods[] = { /* ofw_pci interface */ DEVMETHOD(ofw_pci_intr_pending, psycho_intr_pending), - DEVMETHOD(ofw_pci_get_bus_handle, psycho_get_bus_handle), DEVMETHOD(ofw_pci_adjust_busrange, psycho_adjust_busrange), { 0, 0 } @@ -1278,25 +1276,6 @@ psycho_intr_pending(device_t dev, ofw_pci_intr_t intr) return (diag != 0); } -static bus_space_handle_t -psycho_get_bus_handle(device_t dev, int type, bus_space_handle_t childhdl, - bus_space_tag_t *tag) -{ - struct psycho_softc *sc; - - sc = device_get_softc(dev); - switch (type) { - case SYS_RES_IOPORT: - *tag = sc->sc_pci_iot; - return (sc->sc_pci_bh[OFW_PCI_CS_IO] + childhdl); - case SYS_RES_MEMORY: - *tag = sc->sc_pci_memt; - return (sc->sc_pci_bh[OFW_PCI_CS_MEM32] + childhdl); - default: - panic("%s: illegal space (%d)\n", __func__, type); - } -} - static phandle_t psycho_get_node(device_t bus, device_t dev) { |