From owner-svn-src-projects@FreeBSD.ORG Sat Dec 8 18:35:46 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 57B85A76; Sat, 8 Dec 2012 18:35:46 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1ED318FC08; Sat, 8 Dec 2012 18:35:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB8IZjVs093836; Sat, 8 Dec 2012 18:35:45 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB8IZjY5093834; Sat, 8 Dec 2012 18:35:45 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201212081835.qB8IZjY5093834@svn.freebsd.org> From: Jeff Roberson Date: Sat, 8 Dec 2012 18:35:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244035 - projects/physbio/sys/sparc64/sparc64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Dec 2012 18:35:46 -0000 Author: jeff Date: Sat Dec 8 18:35:45 2012 New Revision: 244035 URL: http://svnweb.freebsd.org/changeset/base/244035 Log: - Correct a few compile errors, dmat is spelled dt, unused variable, etc. Sponsored by: EMC / Isilon Storage Division Modified: projects/physbio/sys/sparc64/sparc64/bus_machdep.c projects/physbio/sys/sparc64/sparc64/iommu.c Modified: projects/physbio/sys/sparc64/sparc64/bus_machdep.c ============================================================================== --- projects/physbio/sys/sparc64/sparc64/bus_machdep.c Sat Dec 8 17:41:39 2012 (r244034) +++ projects/physbio/sys/sparc64/sparc64/bus_machdep.c Sat Dec 8 18:35:45 2012 (r244035) @@ -410,7 +410,7 @@ nexus_dmamap_mayblock(bus_dma_tag_t dmat } -void +static void nexus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmamap_callback_t *callback, void *callback_arg, int nsegs, int error) { Modified: projects/physbio/sys/sparc64/sparc64/iommu.c ============================================================================== --- projects/physbio/sys/sparc64/sparc64/iommu.c Sat Dec 8 17:41:39 2012 (r244034) +++ projects/physbio/sys/sparc64/sparc64/iommu.c Sat Dec 8 18:35:45 2012 (r244035) @@ -860,7 +860,6 @@ iommu_dvmamap_load_buffer(bus_dma_tag_t vm_offset_t vaddr, voffs; vm_paddr_t curaddr; int error, firstpg, sgcnt; - int first; u_int slot; is = dt->dt_cookie; @@ -977,7 +976,7 @@ iommu_dvmamap_mayblock(bus_dma_tag_t dma } static void -iommu_dvmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map, +iommu_dvmamap_complete(bus_dma_tag_t dt, bus_dmamap_t map, bus_dmamap_callback_t *callback, void *callback_arg, int nsegs, int error) { struct iommu_state *is = dt->dt_cookie; @@ -996,7 +995,7 @@ iommu_dvmamap_complete(bus_dma_tag_t dma } static void -iommu_dvmamap_complete2(bus_dma_tag_t dmat, bus_dmamap_t map, +iommu_dvmamap_complete2(bus_dma_tag_t dt, bus_dmamap_t map, bus_dmamap_callback2_t *callback, void *callback_arg, int nsegs, bus_size_t len, int error) { @@ -1016,7 +1015,7 @@ iommu_dvmamap_complete2(bus_dma_tag_t dm } static void -iommu_dvmamap_directseg(bus_dma_tag_t dmat, bus_dmamap_t map, +iommu_dvmamap_directseg(bus_dma_tag_t dt, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, int error) { struct iommu_state *is = dt->dt_cookie; @@ -1030,7 +1029,6 @@ iommu_dvmamap_directseg(bus_dma_tag_t dm IS_UNLOCK(is); map->dm_flags |= DMF_LOADED; } - return (error); } static void