Module Name: src
Committed By: macallan
Date: Wed Jul 7 22:53:44 UTC 2010
Modified Files:
src/sys/arch/arm/omap: files.omap2
Added Files:
src/sys/arch/arm/omap: omap_dma.c
Log Message:
bus_dma, straight from arm32. Will probably need adjustments.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/files.omap2
cvs rdiff -u -r0 -r1.2 src/sys/arch/arm/omap/omap_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/files.omap2
diff -u src/sys/arch/arm/omap/files.omap2:1.3 src/sys/arch/arm/omap/files.omap2:1.4
--- src/sys/arch/arm/omap/files.omap2:1.3 Wed Aug 27 11:03:10 2008
+++ src/sys/arch/arm/omap/files.omap2 Wed Jul 7 22:53:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.omap2,v 1.3 2008/08/27 11:03:10 matt Exp $
+# $NetBSD: files.omap2,v 1.4 2010/07/07 22:53:44 macallan Exp $
#
# Configuration info for Texas Instruments OMAP2/OMAP3 CPU support
# Based on xscale/files.pxa2x0
@@ -7,6 +7,7 @@
include "arch/arm/pic/files.pic"
file arch/arm/arm32/irq_dispatch.S
+file arch/arm/omap/omap_dma.c
# Memory size in megabytes
defparam opt_omap.h MEMSIZE
@@ -83,6 +84,9 @@
attach ohci at obio with obioohci
file arch/arm/omap/obio_ohci.c obioohci
+device omapfb: rasops16, rasops8, wsemuldisplaydev, vcons
+attach omapfb at obio
+file arch/arm/omap/omapfb.c omapfb
# these bus space methods are not bus-specific ...
#
Added files:
Index: src/sys/arch/arm/omap/omap_dma.c
diff -u /dev/null src/sys/arch/arm/omap/omap_dma.c:1.2
--- /dev/null Wed Jul 7 22:53:44 2010
+++ src/sys/arch/arm/omap/omap_dma.c Wed Jul 7 22:53:44 2010
@@ -0,0 +1,61 @@
+/* $NetBSD: omap_dma.c,v 1.2 2010/07/07 22:53:44 macallan Exp $ */
+
+/*
+ * Copyright (c) 2010 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v 1.2 2010/07/07 22:53:44 macallan Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+
+#include <uvm/uvm_extern.h>
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <machine/bus.h>
+
+struct arm32_bus_dma_tag omap_bus_dma_tag = {
+ 0,
+ 0,
+ NULL, /* _cookie */
+ _bus_dmamap_create,
+ _bus_dmamap_destroy,
+ _bus_dmamap_load,
+ _bus_dmamap_load_mbuf,
+ _bus_dmamap_load_uio,
+ _bus_dmamap_load_raw,
+ _bus_dmamap_unload,
+ _bus_dmamap_sync,
+ NULL, /* sync_post */
+ _bus_dmamem_alloc,
+ _bus_dmamem_free,
+ _bus_dmamem_map,
+ _bus_dmamem_unmap,
+ _bus_dmamem_mmap
+};
+
