From owner-svn-src-projects@FreeBSD.ORG Sun Dec 1 21:44:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A52C14A; Sun, 1 Dec 2013 21:44:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 161421BFB; Sun, 1 Dec 2013 21:44:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB1Li6GH020564; Sun, 1 Dec 2013 21:44:06 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB1Li6RV020560; Sun, 1 Dec 2013 21:44:06 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201312012144.rB1Li6RV020560@svn.freebsd.org> From: Andrew Turner Date: Sun, 1 Dec 2013 21:44:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258816 - in projects/specific_leg/sys/arm: arm broadcom/bcm2835 ti 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.16 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: Sun, 01 Dec 2013 21:44:07 -0000 Author: andrew Date: Sun Dec 1 21:44:05 2013 New Revision: 258816 URL: http://svnweb.freebsd.org/changeset/base/258816 Log: Move bus_dma_get_range and bus_dma_get_range_nb to use the platform code. Modified: projects/specific_leg/sys/arm/arm/platform.c projects/specific_leg/sys/arm/arm/platform_if.m projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/specific_leg/sys/arm/ti/ti_machdep.c Modified: projects/specific_leg/sys/arm/arm/platform.c ============================================================================== --- projects/specific_leg/sys/arm/arm/platform.c Sun Dec 1 21:10:07 2013 (r258815) +++ projects/specific_leg/sys/arm/arm/platform.c Sun Dec 1 21:44:05 2013 (r258816) @@ -34,11 +34,13 @@ __FBSDID("$FreeBSD$"); * through a previously registered kernel object. */ +#define _ARM32_BUS_DMA_PRIVATE #include #include #include #include #include +#include #include #include #include @@ -47,6 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -185,3 +188,14 @@ arm_unmask_irq(uintptr_t irq) PLATFORM_UNMASK_IRQ(plat_obj, irq); } +struct arm32_dma_range * +bus_dma_get_range(void) +{ + return PLATFORM_BUS_DMA_GET_RANGE(plat_obj); +} + +int +bus_dma_get_range_nb(void) +{ + return PLATFORM_BUS_DMA_GET_RANGE_NB(plat_obj); +} Modified: projects/specific_leg/sys/arm/arm/platform_if.m ============================================================================== --- projects/specific_leg/sys/arm/arm/platform_if.m Sun Dec 1 21:10:07 2013 (r258815) +++ projects/specific_leg/sys/arm/arm/platform_if.m Sun Dec 1 21:44:05 2013 (r258816) @@ -56,6 +56,18 @@ CODE { { return; } + + static struct arm32_dma_range * + platform_null_bus_dma_get_range(platform_t plat) + { + return (NULL); + } + + static int platform_null_bus_dma_get_range_nb(platform_t plat) + { + return (0); + } + #if 0 static int platform_null_smp_first_cpu(platform_t plat, struct cpuref *cpuref) @@ -156,3 +168,15 @@ METHOD void unmask_irq { uintptr_t irq; }; +/** + */ +METHOD struct arm32_dma_range * bus_dma_get_range { + platform_t _plat; +} DEFAULT platform_null_bus_dma_get_range; + +/** + */ +METHOD int bus_dma_get_range_nb { + platform_t _plat; +} DEFAULT platform_null_bus_dma_get_range_nb; + Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Dec 1 21:10:07 2013 (r258815) +++ projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Dec 1 21:44:05 2013 (r258816) @@ -116,20 +116,6 @@ bcm2835_devmap_init(platform_t plat) return (0); } -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() { Modified: projects/specific_leg/sys/arm/ti/ti_machdep.c ============================================================================== --- projects/specific_leg/sys/arm/ti/ti_machdep.c Sun Dec 1 21:10:07 2013 (r258815) +++ projects/specific_leg/sys/arm/ti/ti_machdep.c Sun Dec 1 21:44:05 2013 (r258816) @@ -127,20 +127,6 @@ ti_am335x_devmap_init(platform_t plat) } #endif -struct arm32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - - return (0); -} - void cpu_reset() {