From 875f70dba4ac5331af98ce31da9e3f02bdf2af21 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 26 Sep 2003 05:14:56 +0000 Subject: 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 --- sys/dev/uart/uart_cpu_alpha.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/uart/uart_cpu_alpha.c') diff --git a/sys/dev/uart/uart_cpu_alpha.c b/sys/dev/uart/uart_cpu_alpha.c index fffed6f83a9a..1d78d6a1853c 100644 --- a/sys/dev/uart/uart_cpu_alpha.c +++ b/sys/dev/uart/uart_cpu_alpha.c @@ -58,7 +58,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) return (ENXIO); boothowto |= RB_SERIAL; di->ops = uart_ns8250_ops; - di->bas.iobase = 0x3f8; + di->bas.chan = 0; di->bas.bst = busspace_isa_io; if (bus_space_map(di->bas.bst, 0x3f8, 8, 0, &di->bas.bsh) != 0) return (ENXIO); @@ -96,7 +96,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) * only have ns8250 and successors on alpha. */ di->ops = uart_ns8250_ops; - di->bas.iobase = ivar; + di->bas.chan = 0; di->bas.bst = busspace_isa_io; if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0) continue; -- cgit v1.2.3