diff options
author | marcel <marcel@FreeBSD.org> | 2003-09-26 05:14:56 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2003-09-26 05:14:56 +0000 |
commit | 0653dc7b1be87204016d8f28fd861f3570fea0e9 (patch) | |
tree | d9aaac35b0191aeab19f23c33c5d34bb16d77724 /sys/dev/uart/uart_cpu_ia64.c | |
parent | 728398b5c5d3b44e6f1c8ebecd6451c79b042c1a (diff) | |
download | FreeBSD-src-0653dc7b1be87204016d8f28fd861f3570fea0e9.zip FreeBSD-src-0653dc7b1be87204016d8f28fd861f3570fea0e9.tar.gz |
Revert the introduction of iobase in struct uart_bas. Both the SAB82532
and the Z8530 drivers used the I/O address as a quick and dirty way to
determine which channel they operated on, but formalizing this by
introducing iobase is not a solution. How for example would a driver
know which channel it controls for a multi-channel UART that only has a
single I/O range?
Instead, add an explicit field, called chan, to struct uart_bas that
holds the channel within a device, or 0 otherwise. The chan field is
initialized both by the system device probing (i.e. a system console)
or it is passed down to uart_bus_probe() by any of the bus front-ends.
As such, it impacts all platforms and bus drivers and makes it a rather
large commit.
Remove the use of iobase in uart_cpu_eqres() for pc98. It is expected
that platforms have the capability to compare tag and handle pairs for
equality; as to determine whether two pairs access the same device or
not. The use of iobase for pc98 makes it impossible to formalize this
and turn it into a real newbus function later. This commit reverts
uart_cpu_eqres() for pc98 to an unimplemented function. It has to be
reimplemented using only the tag and handle fields in struct uart_bas.
Rewrite the SAB82532 and Z8530 drivers to use the chan field in struct
uart_bas. Remove the IS_CHANNEL_A and IS_CHANNEL_B macros. We don't
need to abstract anything anymore.
Discussed with: nyan
Tested on: i386, ia64, sparc64
Diffstat (limited to 'sys/dev/uart/uart_cpu_ia64.c')
-rw-r--r-- | sys/dev/uart/uart_cpu_ia64.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c index 8fa5b05..eeaea3b 100644 --- a/sys/dev/uart/uart_cpu_ia64.c +++ b/sys/dev/uart/uart_cpu_ia64.c @@ -56,6 +56,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) { struct dig64_hcdp_table *tbl; struct dig64_hcdp_entry *ent; + bus_addr_t addr; unsigned int i, ivar; /* @@ -74,14 +75,14 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) ent->type != DIG64_HCDP_DBGPORT) continue; + addr = ent->address.addr_high; + addr = (addr << 32) + ent->address.addr_low; di->ops = uart_ns8250_ops; - di->bas.iobase = (ent->address.addr_high << 32) + - ent->address.addr_low; - di->bas.bst = IA64_BUS_SPACE_IO; + di->bas.chan = 0; di->bas.bst = (ent->address.addr_space == 0) ? IA64_BUS_SPACE_MEM : IA64_BUS_SPACE_IO; - if (bus_space_map(di->bas.bst, di->bas.iobase, 8, 0, - &di->bas.bsh) != 0) + if (bus_space_map(di->bas.bst, addr, 8, 0, + &di->bas.bsh) != 0) continue; di->bas.regshft = 0; di->bas.rclk = ent->pclock << 4; @@ -124,7 +125,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) * ns8250 and successors on i386. */ di->ops = uart_ns8250_ops; - di->bas.iobase = ivar; + di->bas.chan = 0; di->bas.bst = IA64_BUS_SPACE_IO; if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0) continue; |