PERFORCE change 38558 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=38558

Change 38558 by marcel at marcel_nfs on 2003/09/24 21:31:33

	Remove last remnants of iobase.

Affected files ...

.. //depot/projects/uart/dev/uart/uart.h#7 edit
.. //depot/projects/uart/dev/uart/uart_core.c#32 edit
.. //depot/projects/uart/dev/uart/uart_cpu_ia64.c#7 edit
.. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#6 edit
.. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#16 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart.h#7 (text+ko) ====

@@ -36,7 +36,6 @@
  * other timing related computations.
  */
 struct uart_bas {
-	bus_addr_t iobase;
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
 	u_int	chan;

==== //depot/projects/uart/dev/uart/uart_core.c#32 (text+ko) ====

@@ -267,7 +267,6 @@
 	 * accordingly. In general, you don't want to permanently disrupt
 	 * console I/O.
 	 */
-	sc->sc_bas.iobase = rman_get_start(sc->sc_rres);
 	sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres);
 	sc->sc_bas.bst = rman_get_bustag(sc->sc_rres);
 	sc->sc_bas.chan = chan;
@@ -327,10 +326,6 @@
 	if (sc->sc_rres == NULL)
 		return (ENXIO);
 
-	sc->sc_bas.iobase = rman_get_start(sc->sc_rres);
-	sc->sc_bas.bsh = rman_get_bushandle(sc->sc_rres);
-	sc->sc_bas.bst = rman_get_bustag(sc->sc_rres);
-
 	sc->sc_irid = 0;
 	sc->sc_ires = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_irid,
 	    0, ~0, 1, RF_ACTIVE);

==== //depot/projects/uart/dev/uart/uart_cpu_ia64.c#7 (text+ko) ====

@@ -56,6 +56,7 @@
 {
 	struct dig64_hcdp_table *tbl;
 	struct dig64_hcdp_entry *ent;
+	bus_addr_t addr;
 	unsigned int i, ivar;
 
 	/*
@@ -74,12 +75,14 @@
 			    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.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;

==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#6 (text+ko) ====

@@ -40,7 +40,7 @@
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
 
-	return ((b1->iobase == b2->iobase && b1->bst == b2->bst) ? 1 : 0);
+	return (0);		/* XXX */
 }
 
 int

==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#16 (text+ko) ====

@@ -138,7 +138,6 @@
 		return (ENXIO);
 
 	/* Fill in the device info. */
-	di->bas.iobase = addr;
 	di->bas.bst = &bst_store[devtype];
 	di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst);