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

1 files changed, 7 insertions, 2 deletions

diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index 94b042e..7277df9 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -63,7 +63,7 @@ uart_puc_probe(device_t dev)
 {
 	device_t parent;
 	struct uart_softc *sc;
-	uintptr_t rclk, regshft, type;
+	uintptr_t port, rclk, regshft, type;
 
 	parent = device_get_parent(dev);
 	sc = device_get_softc(dev);
@@ -73,12 +73,17 @@ uart_puc_probe(device_t dev)
 	switch (type) {
 	case PUC_PORT_UART_NS8250:
 		sc->sc_class = &uart_ns8250_class;
+		port = 0;
 		break;
 	case PUC_PORT_UART_SAB82532:
 		sc->sc_class = &uart_sab82532_class;
+		if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
+			port = 0;
 		break;
 	case PUC_PORT_UART_Z8530:
 		sc->sc_class = &uart_z8530_class;
+		if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
+			port = 0;
 		break;
 	default:
 		return (ENXIO);
@@ -88,7 +93,7 @@ uart_puc_probe(device_t dev)
 		rclk = 0;
 	if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, &regshft))
 		regshft = 0;
-	return (uart_bus_probe(dev, regshft, rclk, 0));
+	return (uart_bus_probe(dev, regshft, rclk, 0, port));
 }
 
 DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0);