summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/isa
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2007-01-18 13:52:44 +0000
committermarius <marius@FreeBSD.org>2007-01-18 13:52:44 +0000
commit52099a4877411d2bc0a06d7c071d7bc464d9cd13 (patch)
tree71ac6785ddff180620abf3962fda0ccb2e8b23d7 /sys/sparc64/isa
parent85c3e6d089a47ffbf7d2b8bd714fe07527f3667b (diff)
downloadFreeBSD-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/isa')
-rw-r--r--sys/sparc64/isa/isa.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/sparc64/isa/isa.c b/sys/sparc64/isa/isa.c
index 75c736b..d30e3d3 100644
--- a/sys/sparc64/isa/isa.c
+++ b/sys/sparc64/isa/isa.c
@@ -54,11 +54,6 @@ __FBSDID("$FreeBSD$");
#include <sparc64/isa/ofw_isa.h>
/* There can be only one ISA bus, so it is safe to use globals. */
-bus_space_tag_t isa_io_bt = NULL;
-bus_space_handle_t isa_io_hdl;
-bus_space_tag_t isa_mem_bt = NULL;
-bus_space_handle_t isa_mem_hdl;
-
static u_int64_t isa_io_base;
static u_int64_t isa_io_limit;
static u_int64_t isa_mem_base;
@@ -139,15 +134,11 @@ isa_init(device_t dev)
/* This is probably always 0. */
isa_io_base = ISAB_RANGE_PHYS(&isab_ranges[i]);
isa_io_limit = isab_ranges[i].size;
- isa_io_hdl = OFW_PCI_GET_BUS_HANDLE(bridge,
- SYS_RES_IOPORT, isa_io_base, &isa_io_bt);
break;
case ISAR_SPACE_MEM:
/* This is probably always 0. */
isa_mem_base = ISAB_RANGE_PHYS(&isab_ranges[i]);
isa_mem_limit = isab_ranges[i].size;
- isa_mem_hdl = OFW_PCI_GET_BUS_HANDLE(bridge,
- SYS_RES_MEMORY, isa_mem_base, &isa_mem_bt);
break;
}
}
@@ -359,14 +350,10 @@ isa_alloc_resource(device_t bus, device_t child, int type, int *rid,
base = limit = 0;
switch (type) {
case SYS_RES_MEMORY:
- if (isa_mem_bt == NULL)
- return (NULL);
base = isa_mem_base;
limit = base + isa_mem_limit;
break;
case SYS_RES_IOPORT:
- if (isa_io_bt == NULL)
- return (NULL);
base = isa_io_base;
limit = base + isa_io_limit;
break;
OpenPOWER on IntegriCloud