From owner-p4-projects@FreeBSD.ORG Thu May 24 04:54:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDEF216A46E; Thu, 24 May 2007 04:54:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8C59516A46C for ; Thu, 24 May 2007 04:54:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7EBE313C458 for ; Thu, 24 May 2007 04:54:00 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4O4s0dl051916 for ; Thu, 24 May 2007 04:54:00 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4O4rx3t051901 for perforce@freebsd.org; Thu, 24 May 2007 04:53:59 GMT (envelope-from marcel@freebsd.org) Date: Thu, 24 May 2007 04:53:59 GMT Message-Id: <200705240453.l4O4rx3t051901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 120299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2007 04:54:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120299 Change 120299 by marcel@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) {