From owner-p4-projects@FreeBSD.ORG Sat May 29 02:11:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA8F616A4D0; Sat, 29 May 2004 02:11:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8049816A4CE for ; Sat, 29 May 2004 02:11:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AD9B43D1D for ; Sat, 29 May 2004 02:11:45 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4T9BAHa041415 for ; Sat, 29 May 2004 02:11:10 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4T9BAuE041412 for perforce@freebsd.org; Sat, 29 May 2004 02:11:10 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Sat, 29 May 2004 02:11:10 -0700 (PDT) Message-Id: <200405290911.i4T9BAuE041412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53734 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2004 09:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=53734 Change 53734 by scottl@scottl-esp-sparc64 on 2004/05/29 02:11:02 Starting changing the DMA engine code so that it can be compiled. Fix up headers, modify bus_space usage, etc. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#9 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#3 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#4 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#9 (text+ko) ==== @@ -210,6 +210,7 @@ lsc->sc_channel = L64854_CHANNEL_SCSI; lsc->sc_client = sc; + lsc->sc_dev = dev; lsi64854_attach(lsc); ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#3 (text+ko) ==== @@ -37,30 +37,26 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $"); #include #include +#include #include -#include -#include -#include - -#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include void lsi64854_reset(struct lsi64854_softc *); int lsi64854_setup(struct lsi64854_softc *, caddr_t *, size_t *, @@ -97,7 +93,7 @@ { u_int32_t csr; - sc->dv_name = device_get_nameunit(sc->sc_client); + sc->dv_name = device_get_nameunit(sc->sc_dev); /* Indirect functions */ switch (sc->sc_channel) { @@ -279,7 +275,7 @@ L64854_SCSR(sc, csr); if (sc->sc_rev == DMAREV_HME) { - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, 0); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, 0); sc->sc_dmactl = csr; } sc->sc_active = 0; @@ -328,7 +324,7 @@ L64854_SCSR(sc, sc->sc_dmactl | L64854_RESET); L64854_SCSR(sc, sc->sc_dmactl); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, *dmasize); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, *dmasize); } /* Program the DMA address */ @@ -343,7 +339,7 @@ datain ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, sc->sc_dmamap->dm_segs[0].ds_addr); } @@ -353,7 +349,7 @@ long eaddr = bcnt + (long)*sc->sc_dmaaddr; if ((eaddr & PGOFSET) != 0) bcnt = roundup(bcnt, PAGE_SIZE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, bcnt); } @@ -395,7 +391,7 @@ csr = L64854_GCSR(sc); DPRINTF(LDB_SCSI, ("%s: dmaintr: addr 0x%x, csr %s\n", sc->dv_name, - bus_space_read_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR), + bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), bitmask_snprintf(csr, DDMACSR_BITS, bits, sizeof(bits)))); if (csr & (D_ERR_PEND|D_SLAVE_ERR)) { @@ -590,10 +586,10 @@ datain ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, sc->sc_dmamap->dm_segs[0].ds_addr); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, sc->sc_dmasize); } @@ -634,11 +630,11 @@ csr = L64854_GCSR(sc); DPRINTF(LDB_PP, ("%s: pp intr: addr 0x%x, csr %s\n", sc->dv_name, - bus_space_read_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR), + bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), bitmask_snprintf(csr, PDMACSR_BITS, bits, sizeof(bits)))); if (csr & (P_ERR_PEND|P_SLAVE_ERR)) { - resid = bus_space_read_4(sc->sc_bustag, sc->sc_regs, + resid = bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT); printf("%s: pp error: resid %d csr=%s\n", sc->dv_name, resid, bitmask_snprintf(csr, PDMACSR_BITS, bits,sizeof(bits))); @@ -653,7 +649,7 @@ if (sc->sc_active != 0) { DMA_DRAIN(sc, 0); - resid = bus_space_read_4(sc->sc_bustag, sc->sc_regs, + resid = bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT); } ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#4 (text+ko) ==== @@ -37,7 +37,8 @@ */ struct lsi64854_softc { - char *dv_name; + device_t sc_dev; + const char *dv_name; int sc_rid; struct resource *sc_res;