svn commit: r258816 - in projects/specific_leg/sys/arm: arm broadcom/bcm2835 ti
Andrew Turner
andrew at FreeBSD.org
Sun Dec 1 21:44:07 UTC 2013
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 <sys/param.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/ktr.h>
#include <sys/mutex.h>
+#include <sys/rman.h>
#include <sys/systm.h>
#include <sys/smp.h>
#include <sys/sysctl.h>
@@ -47,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
+#include <machine/bus_dma.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/md_var.h>
@@ -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()
{
More information about the svn-src-projects
mailing list