Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm move from sys/arch/arm/arm32/armv7_generic_dma....
details: https://anonhg.NetBSD.org/src/rev/8b9f2883a350
branches: trunk
changeset: 321477:8b9f2883a350
user: ryo <ryo%NetBSD.org@localhost>
date: Sat Mar 17 18:34:09 2018 +0000
description:
move from sys/arch/arm/arm32/armv7_generic_dma.c to sys/arch/arm/arm/arm_generic_dma.c,
and change variable name from armv7_generic_dma_tag to arm_generic_dma_tag
no functional change. (preliminary changes for merging aarch64)
diffstat:
sys/arch/arm/arm/arm_generic_dma.c | 41 +++++++++++++++++++++++++++++++
sys/arch/arm/arm32/armv7_generic_dma.c | 40 ------------------------------
sys/arch/arm/broadcom/bcm283x_platform.c | 6 ++--
sys/arch/arm/broadcom/files.bcm2835 | 4 +-
sys/arch/arm/imx/files.imx51 | 4 +-
sys/arch/arm/imx/files.imx6 | 4 +-
sys/arch/arm/imx/files.imx7 | 4 +-
sys/arch/arm/imx/imx51_axi.c | 6 ++--
sys/arch/arm/imx/imx51_ipuv3.c | 6 ++--
sys/arch/arm/imx/imx51_usb.c | 6 ++--
sys/arch/arm/imx/imx51var.h | 4 +-
sys/arch/arm/imx/imx6_axi.c | 6 ++--
sys/arch/arm/imx/imx6_usb.c | 6 ++--
sys/arch/arm/imx/imx6var.h | 4 +-
sys/arch/arm/imx/imx7_axi.c | 6 ++--
sys/arch/arm/imx/imx7_usb.c | 6 ++--
sys/arch/arm/imx/imx7var.h | 4 +-
sys/arch/arm/nvidia/files.tegra | 4 +-
sys/arch/arm/nvidia/tegra_platform.c | 8 +++---
sys/arch/arm/samsung/exynos_platform.c | 8 +++---
sys/arch/arm/samsung/files.exynos | 4 +-
sys/arch/arm/sunxi/files.sunxi | 4 +-
sys/arch/arm/sunxi/sunxi_platform.c | 8 +++---
sys/arch/arm/ti/files.ti | 4 +-
sys/arch/arm/ti/ti_platform.c | 8 +++---
sys/arch/arm/vexpress/files.vexpress | 4 +-
sys/arch/arm/vexpress/vexpress_platform.c | 8 +++---
27 files changed, 109 insertions(+), 108 deletions(-)
diffs (truncated from 690 to 300 lines):
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/arm/arm_generic_dma.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/arm/arm_generic_dma.c Sat Mar 17 18:34:09 2018 +0000
@@ -0,0 +1,41 @@
+/* $NetBSD: arm_generic_dma.c,v 1.1 2018/03/17 18:34:09 ryo Exp $ */
+
+/*-
+ * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
+ * 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: arm_generic_dma.c,v 1.1 2018/03/17 18:34:09 ryo Exp $");
+
+#define _ARM32_BUS_DMA_PRIVATE
+
+#include <sys/param.h>
+#include <sys/bus.h>
+
+struct arm32_bus_dma_tag arm_generic_dma_tag = {
+ _BUS_DMAMAP_FUNCS,
+ _BUS_DMAMEM_FUNCS,
+ _BUS_DMATAG_FUNCS,
+};
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/arm32/armv7_generic_dma.c
--- a/sys/arch/arm/arm32/armv7_generic_dma.c Sat Mar 17 18:22:23 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/* $NetBSD: armv7_generic_dma.c,v 1.1 2017/05/28 00:34:51 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
- * 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: armv7_generic_dma.c,v 1.1 2017/05/28 00:34:51 jmcneill Exp $");
-
-#define _ARM32_BUS_DMA_PRIVATE
-#include <sys/param.h>
-#include <sys/bus.h>
-
-struct arm32_bus_dma_tag armv7_generic_dma_tag = {
- _BUS_DMAMAP_FUNCS,
- _BUS_DMAMEM_FUNCS,
- _BUS_DMATAG_FUNCS,
-};
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/broadcom/bcm283x_platform.c
--- a/sys/arch/arm/broadcom/bcm283x_platform.c Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/broadcom/bcm283x_platform.c Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.2 2017/12/20 14:35:12 skrll Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.2 2017/12/20 14:35:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -118,7 +118,7 @@
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
-extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
+extern struct arm32_bus_dma_tag arm_generic_dma_tag;
/* Prototypes for all the bus_space structure functions */
bs_protos(bcm2835);
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/broadcom/files.bcm2835
--- a/sys/arch/arm/broadcom/files.bcm2835 Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/broadcom/files.bcm2835 Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm2835,v 1.29 2017/12/10 21:38:26 skrll Exp $
+# $NetBSD: files.bcm2835,v 1.30 2018/03/17 18:34:09 ryo Exp $
#
# Configuration info for Broadcom BCM2835 ARM Peripherals
#
@@ -10,7 +10,7 @@
file arch/arm/arm32/arm32_reboot.c
file arch/arm/arm32/irq_dispatch.S
file arch/arm/arm32/armv7_generic_space.c
-file arch/arm/arm32/armv7_generic_dma.c
+file arch/arm/arm/arm_generic_dma.c
file arch/arm/arm/bus_space_a4x.S
file arch/arm/broadcom/bcm2835_dma.c
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/files.imx51
--- a/sys/arch/arm/imx/files.imx51 Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/files.imx51 Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx51,v 1.17 2017/09/08 05:29:12 hkenken Exp $
+# $NetBSD: files.imx51,v 1.18 2018/03/17 18:34:09 ryo Exp $
#
# Configuration info for the Freescale i.MX5x
#
@@ -16,7 +16,7 @@
define bus_dma_generic
file arch/arm/arm32/armv7_generic_space.c
-file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
+file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag
file arch/arm/arm/bus_space_a4x.S
# iMX51 AXI/AHB bus interface and SoC domains
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/files.imx6
--- a/sys/arch/arm/imx/files.imx6 Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/files.imx6 Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx6,v 1.12 2017/11/09 05:57:23 hkenken Exp $
+# $NetBSD: files.imx6,v 1.13 2018/03/17 18:34:09 ryo Exp $
#
# Configuration info for the Freescale i.MX6
#
@@ -16,7 +16,7 @@
define bus_dma_generic
file arch/arm/arm32/armv7_generic_space.c
-file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
+file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag
file arch/arm/arm/bus_space_a4x.S
file arch/arm/imx/imx6_board.c
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/files.imx7
--- a/sys/arch/arm/imx/files.imx7 Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/files.imx7 Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx7,v 1.5 2017/09/08 05:29:12 hkenken Exp $
+# $NetBSD: files.imx7,v 1.6 2018/03/17 18:34:09 ryo Exp $
#
# Configuration info for the Freescale i.MX7
#
@@ -17,7 +17,7 @@
define bus_dma_generic
file arch/arm/arm32/armv7_generic_space.c
-file arch/arm/arm32/armv7_generic_dma.c bus_dma_generic needs-flag
+file arch/arm/arm/arm_generic_dma.c bus_dma_generic needs-flag
file arch/arm/arm/bus_space_a4x.S
file arch/arm/imx/imx7_board.c
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/imx51_axi.c
--- a/sys/arch/arm/imx/imx51_axi.c Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/imx51_axi.c Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */
+/* $NetBSD: imx51_axi.c,v 1.7 2018/03/17 18:34:09 ryo Exp $ */
/*-
* Copyright (c) 2010 SHIMIZU Ryo <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_axi.c,v 1.7 2018/03/17 18:34:09 ryo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -78,7 +78,7 @@
sc = device_private(self);
sc->sc_iot = &armv7_generic_bs_tag;
#if NBUS_DMA_GENERIC > 0
- sc->sc_dmat = &armv7_generic_dma_tag;
+ sc->sc_dmat = &arm_generic_dma_tag;
#else
sc->sc_dmat = 0;
#endif
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/imx51_ipuv3.c
--- a/sys/arch/arm/imx/imx51_ipuv3.c Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/imx51_ipuv3.c Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $ */
+/* $NetBSD: imx51_ipuv3.c,v 1.7 2018/03/17 18:34:09 ryo Exp $ */
/*
* Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.6 2017/08/17 09:11:04 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.7 2018/03/17 18:34:09 ryo Exp $");
#include "opt_imx51_ipuv3.h"
@@ -579,7 +579,7 @@
LIST_INIT(&sc->screens);
sc->iot = iot;
- sc->dma_tag = &armv7_generic_dma_tag;
+ sc->dma_tag = &arm_generic_dma_tag;
/* map controller registers */
error = bus_space_map(iot, IPU_CM_BASE, IPU_CM_SIZE, 0, &sc->cm_ioh);
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/imx51_usb.c
--- a/sys/arch/arm/imx/imx51_usb.c Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/imx51_usb.c Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $ */
+/* $NetBSD: imx51_usb.c,v 1.4 2018/03/17 18:34:09 ryo Exp $ */
/*
* Copyright (c) 2010 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.3 2017/08/17 09:11:04 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_usb.c,v 1.4 2018/03/17 18:34:09 ryo Exp $");
#include "opt_imx.h"
@@ -80,7 +80,7 @@
aa.aa_iot = sc->sc_iot;
aa.aa_ioh = sc->sc_ioh;
- aa.aa_dmat = &armv7_generic_dma_tag;
+ aa.aa_dmat = &arm_generic_dma_tag;
aa.aa_unit = cf->cf_loc[IMXUSBCCF_UNIT];
aa.aa_irq = cf->cf_loc[IMXUSBCCF_IRQ];
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/imx51var.h
--- a/sys/arch/arm/imx/imx51var.h Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/imx51var.h Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx51var.h,v 1.5 2017/08/17 09:11:04 hkenken Exp $ */
+/* $NetBSD: imx51var.h,v 1.6 2018/03/17 18:34:09 ryo Exp $ */
/*
* Copyright (c) 2015 Genetec Corporation. All rights reserved.
@@ -46,7 +46,7 @@
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
-extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
+extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct arm32_bus_dma_tag imx_bus_dma_tag;
void gpio_set_direction(uint32_t, uint32_t);
diff -r 8eacbe19fcc0 -r 8b9f2883a350 sys/arch/arm/imx/imx6_axi.c
--- a/sys/arch/arm/imx/imx6_axi.c Sat Mar 17 18:22:23 2018 +0000
+++ b/sys/arch/arm/imx/imx6_axi.c Sat Mar 17 18:34:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_axi.c,v 1.4 2017/11/09 05:57:23 hkenken Exp $ */
+/* $NetBSD: imx6_axi.c,v 1.5 2018/03/17 18:34:09 ryo Exp $ */
/*
* Copyright (c) 2014 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
Home |
Main Index |
Thread Index |
Old Index