PERFORCE change 120299 for review

[Marcel Moolenaar]

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

Change 120299 by marcel at marcel_macbsd on 2007/05/24 04:53:42

	PPC_BUS_SPACE_MEM & PPC_BUS_SPACE_IO are no more.
	There's no difference between I/O space and memory
	mapped I/O, but we do have big-endian & little-
	endian to worry about.

Affected files ...

.. //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#3 edit
.. //depot/projects/e500/sys/powerpc/powermac/grackle.c#2 edit
.. //depot/projects/e500/sys/powerpc/powermac/macio.c#2 edit
.. //depot/projects/e500/sys/powerpc/powermac/uninorth.c#2 edit
.. //depot/projects/e500/sys/powerpc/psim/iobus.c#2 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/aim/ofw_machdep.c#3 (text+ko) ====

@@ -415,10 +415,7 @@
 		OF_get_addr_props(bridge, &naddr, &nsize, &pci);
 	}
 
-	/* Default to memory mapped I/O. */
-	*tag = PPC_BUS_SPACE_MEM;
-	if (spc == OFW_PCI_PHYS_HI_SPACE_IO)
-		*tag = PPC_BUS_SPACE_IO;
+	*tag = &bs_le_tag;
 	return (bus_space_map(*tag, addr, size, 0, handle));
 }
 

==== //depot/projects/e500/sys/powerpc/powermac/grackle.c#2 (text+ko) ====

@@ -361,7 +361,6 @@
 	struct			grackle_softc *sc;
 	struct			resource *rv;
 	struct			rman *rm;
-	bus_space_tag_t		bt;
 	int			needactivate;
 
 	needactivate = flags & RF_ACTIVE;
@@ -372,18 +371,15 @@
 	switch (type) {
 	case SYS_RES_MEMORY:
 		rm = &sc->sc_mem_rman;
-		bt = PPC_BUS_SPACE_MEM;
 		break;
 
 	case SYS_RES_IOPORT:
 		rm = &sc->sc_io_rman;
-		bt = PPC_BUS_SPACE_IO;
 		break;
 
 	case SYS_RES_IRQ:
 		return (bus_alloc_resource(bus, type, rid, start, end, count,
 		    flags));
-		break;
 
 	default:
 		device_printf(bus, "unknown resource request from %s\n",
@@ -399,7 +395,7 @@
 	}
 
 	rman_set_rid(rv, *rid);
-	rman_set_bustag(rv, bt);
+	rman_set_bustag(rv, &bs_le_tag);
 	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {

==== //depot/projects/e500/sys/powerpc/powermac/macio.c#2 (text+ko) ====

@@ -369,7 +369,6 @@
 	int		needactivate;
 	struct		resource *rv;
 	struct		rman *rm;
-	bus_space_tag_t	tagval;
 	u_long		adjstart, adjend, adjcount;
 	struct		macio_devinfo *dinfo;
 	struct		resource_list_entry *rle;
@@ -408,8 +407,6 @@
 		adjcount = adjend - adjstart;
 
 		rm = &sc->sc_mem_rman;
-
-		tagval = PPC_BUS_SPACE_MEM;
 		break;
 
 	case SYS_RES_IRQ:
@@ -431,7 +428,6 @@
 
 		return (resource_list_alloc(&dinfo->mdi_resources, bus, child,
 		    type, rid, start, end, count, flags));
-		break;
 
 	default:
 		device_printf(bus, "unknown resource request from %s\n",
@@ -449,7 +445,7 @@
 	}
 
 	rman_set_rid(rv, *rid);
-	rman_set_bustag(rv, tagval);
+	rman_set_bustag(rv, &bs_le_tag);
 	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {

==== //depot/projects/e500/sys/powerpc/powermac/uninorth.c#2 (text+ko) ====

@@ -345,7 +345,6 @@
 	struct			uninorth_softc *sc;
 	struct			resource *rv;
 	struct			rman *rm;
-	bus_space_tag_t		bt;
 	int			needactivate;
 
 	needactivate = flags & RF_ACTIVE;
@@ -356,18 +355,16 @@
 	switch (type) {
 	case SYS_RES_MEMORY:
 		rm = &sc->sc_mem_rman;
-		bt = PPC_BUS_SPACE_MEM;
 		break;
 
 	case SYS_RES_IOPORT:
 		rm = &sc->sc_io_rman;
-		bt = PPC_BUS_SPACE_IO;
 		break;
 
 	case SYS_RES_IRQ:
 		return (bus_alloc_resource(bus, type, rid, start, end, count,
 		    flags));
-		break;
+
 	default:
 		device_printf(bus, "unknown resource request from %s\n",
 		    device_get_nameunit(child));
@@ -382,7 +379,7 @@
 	}
 
 	rman_set_rid(rv, *rid);
-	rman_set_bustag(rv, bt);
+	rman_set_bustag(rv, &bs_le_tag);
 	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {

==== //depot/projects/e500/sys/powerpc/psim/iobus.c#2 (text+ko) ====

@@ -322,15 +322,13 @@
 	case SYS_RES_MEMORY:
 	case SYS_RES_IOPORT:
 		rm = &sc->sc_mem_rman;
-		tagval = PPC_BUS_SPACE_MEM;
 		break;
 	case SYS_RES_IRQ:
 		return (bus_alloc_resource(bus, type, rid, start, end, count,
-					   flags));
-		break;
+		    flags));
 	default:
 		device_printf(bus, "unknown resource request from %s\n",
-			      device_get_nameunit(child));
+		    device_get_nameunit(child));
 		return (NULL);
 	}
 
@@ -342,7 +340,7 @@
 	}
 
 	rman_set_rid(rv, *rid);
-	rman_set_bustag(rv, tagval);
+	rman_set_bustag(rv, &bs_le_tag);
 	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {