From owner-p4-projects@FreeBSD.ORG Tue Jul 31 15:15:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19C8216A41B; Tue, 31 Jul 2007 15:15:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2932A16A419 for ; Tue, 31 Jul 2007 15:15:43 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAF8813C459 for ; Tue, 31 Jul 2007 15:15:42 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6VFFg3n052166 for ; Tue, 31 Jul 2007 15:15:42 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6VFFg9I052163 for perforce@freebsd.org; Tue, 31 Jul 2007 15:15:42 GMT (envelope-from loafier@FreeBSD.org) Date: Tue, 31 Jul 2007 15:15:42 GMT Message-Id: <200707311515.l6VFFg9I052163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 124427 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: Tue, 31 Jul 2007 15:15:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=124427 Change 124427 by loafier@chrisdsoc on 2007/07/31 15:15:11 Edit tags, handles, read, write. Affected files ... .. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/sbus/cs4231.c#2 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/sbus/cs4231.c#2 (text+ko) ==== @@ -112,8 +112,6 @@ struct device *sc_dev; int sc_rid[CS4231_RES_MEM_MAX]; struct resource *sc_res[CS4231_RES_MEM_MAX]; - bus_space_handle_t sc_regh[CS4231_RES_MEM_MAX]; - bus_space_tag_t sc_regt[CS4231_RES_MEM_MAX]; int sc_irqrid[CS4231_RES_IRQ_MAX]; struct resource *sc_irqres[CS4231_RES_IRQ_MAX]; @@ -192,30 +190,30 @@ #define CS4231_LOCK_ASSERT(sc) snd_mtxassert(sc->sc_lock) #define CS_WRITE(sc,r,v) \ - bus_space_write_1((sc)->sc_regt[0], (sc)->sc_regh[0], (r) << 2, (v)) + bus_write_1((sc)->sc_res[0], (r) << 2, (v)) #define CS_READ(sc,r) \ - bus_space_read_1((sc)->sc_regt[0], (sc)->sc_regh[0], (r) << 2) + bus_read_1((sc)->sc_res[0], (r) << 2) #define APC_WRITE(sc,r,v) \ - bus_space_write_4(sc->sc_regt[0], sc->sc_regh[0], r, v) + bus_write_4(sc->sc_res[0], r, v) #define APC_READ(sc,r) \ - bus_space_read_4(sc->sc_regt[0], sc->sc_regh[0], r) + bus_read_4(sc->sc_res[0], r) #define EBDMA_P_WRITE(sc,r,v) \ - bus_space_write_4((sc)->sc_regt[1], (sc)->sc_regh[1], (r), (v)) + bus_write_4((sc)->sc_res[1], (r), (v)) #define EBDMA_P_READ(sc,r) \ - bus_space_read_4((sc)->sc_regt[1], (sc)->sc_regh[1], (r)) + bus_read_4((sc)->sc_res[1], (r)) #define EBDMA_C_WRITE(sc,r,v) \ - bus_space_write_4((sc)->sc_regt[2], (sc)->sc_regh[2], (r), (v)) + bus_write_4((sc)->sc_res[2], (r), (v)) #define EBDMA_C_READ(sc,r) \ - bus_space_read_4((sc)->sc_regt[2], (sc)->sc_regh[2], (r)) + bus_read_4((sc)->sc_res[2], (r)) #define AUXIO_CODEC 0x00 #define AUXIO_WRITE(sc,r,v) \ - bus_space_write_4((sc)->sc_regt[3], (sc)->sc_regh[3], (r), (v)) + bus_write_4((sc)->sc_res[3], (r), (v)) #define AUXIO_READ(sc,r) \ - bus_space_read_4((sc)->sc_regt[3], (sc)->sc_regh[3], (r)) + bus_read_4((sc)->sc_res[3], (r)) #define CODEC_WARM_RESET 0 #define CODEC_COLD_RESET 1 @@ -381,8 +379,6 @@ "cannot map register %d\n", i); goto fail; } - sc->sc_regt[i] = rman_get_bustag(sc->sc_res[i]); - sc->sc_regh[i] = rman_get_bushandle(sc->sc_res[i]); } for (i = 0; i < sc->sc_nires; i++) { sc->sc_irqrid[i] = i;