Index: samsung/exynos/files.exynos5 =================================================================== --- samsung/exynos/files.exynos5 (revision 257529) +++ samsung/exynos/files.exynos5 (working copy) @@ -15,7 +15,7 @@ arm/samsung/exynos/arch_timer.c standard arm/samsung/exynos/exynos5_mp.c optional smp -arm/samsung/exynos/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/samsung/exynos/common.c standard arm/samsung/exynos/exynos5_machdep.c standard arm/samsung/exynos/uart.c optional uart Index: arm/bus_space-v6.c =================================================================== --- arm/bus_space-v6.c (revision 0) +++ arm/bus_space-v6.c (working copy) @@ -0,0 +1,152 @@ +/*- + * Copyright (c) 2012 Damjan Marion + * 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 + +#include +#include +#include +#include +#include + +#include + +/* Prototypes for all the bus_space structure functions */ +bs_protos(generic); +bs_protos(generic_armv4); + +/* + * The bus space tag. This is constant for all instances, so + * we never have to explicitly "create" it. + */ +static struct bus_space _base_tag = { + /* cookie */ + (void *) 0, + + /* mapping/unmapping */ + generic_bs_map, + generic_bs_unmap, + generic_bs_subregion, + + /* allocation/deallocation */ + generic_bs_alloc, + generic_bs_free, + + /* barrier */ + generic_bs_barrier, + + /* read (single) */ + generic_bs_r_1, + generic_armv4_bs_r_2, + generic_bs_r_4, + NULL, + + /* read multiple */ + generic_bs_rm_1, + generic_armv4_bs_rm_2, + generic_bs_rm_4, + NULL, + + /* read region */ + generic_bs_rr_1, + generic_armv4_bs_rr_2, + generic_bs_rr_4, + NULL, + + /* write (single) */ + generic_bs_w_1, + generic_armv4_bs_w_2, + generic_bs_w_4, + NULL, + + /* write multiple */ + generic_bs_wm_1, + generic_armv4_bs_wm_2, + generic_bs_wm_4, + NULL, + + /* write region */ + generic_bs_wr_1, + generic_armv4_bs_wr_2, + generic_bs_wr_4, + NULL, + + /* set multiple */ + NULL, + NULL, + NULL, + NULL, + + /* set region */ + generic_bs_sr_1, + generic_armv4_bs_sr_2, + generic_bs_sr_4, + NULL, + + /* copy */ + NULL, + generic_armv4_bs_c_2, + NULL, + NULL, + + /* read stream (single) */ + NULL, + NULL, + NULL, + NULL, + + /* read multiple stream */ + NULL, + generic_armv4_bs_rm_2, /* bus_space_read_multi_stream_2 */ + NULL, + NULL, + + /* read region stream */ + NULL, + NULL, + NULL, + NULL, + + /* write stream (single) */ + NULL, + NULL, + NULL, + NULL, + + /* write multiple stream */ + NULL, + generic_armv4_bs_wm_2, /* bus_space_write_multi_stream_2 */ + NULL, + NULL, + + /* write region stream */ + NULL, + NULL, + NULL, + NULL +}; + +bus_space_tag_t fdtbus_bs_tag = &_base_tag; Property changes on: arm/bus_space-v6.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: broadcom/bcm2835/files.bcm2835 =================================================================== --- broadcom/bcm2835/files.bcm2835 (revision 257529) +++ broadcom/bcm2835/files.bcm2835 (working copy) @@ -11,7 +11,7 @@ arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi arm/broadcom/bcm2835/bcm2835_systimer.c standard arm/broadcom/bcm2835/bcm2835_wdog.c standard -arm/broadcom/bcm2835/bus_space.c optional fdt +arm/arm/bus_space-v6.c standard arm/broadcom/bcm2835/common.c optional fdt dev/usb/controller/dwc_otg_fdt.c optional dwcotg Index: allwinner/files.a10 =================================================================== --- allwinner/files.a10 (revision 257529) +++ allwinner/files.a10 (working copy) @@ -16,7 +16,7 @@ arm/allwinner/a10_wdog.c standard arm/allwinner/timer.c standard arm/allwinner/aintc.c standard -arm/allwinner/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/allwinner/common.c standard #arm/allwinner/console.c standard arm/allwinner/a10_machdep.c standard Index: allwinner/a20/files.a20 =================================================================== --- allwinner/a20/files.a20 (revision 257529) +++ allwinner/a20/files.a20 (working copy) @@ -16,6 +16,6 @@ arm/allwinner/a10_ehci.c optional ehci arm/allwinner/a10_wdog.c standard arm/allwinner/timer.c standard -arm/allwinner/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/allwinner/common.c standard arm/allwinner/a10_machdep.c standard Index: versatile/files.versatile =================================================================== --- versatile/files.versatile (revision 257529) +++ versatile/files.versatile (working copy) @@ -8,7 +8,7 @@ arm/arm/cpufunc_asm_armv6.S standard arm/arm/irq_dispatch.S standard -arm/versatile/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/versatile/common.c standard arm/versatile/pl050.c optional sc arm/versatile/sp804.c standard Index: ti/files.ti =================================================================== --- ti/files.ti (revision 257529) +++ ti/files.ti (working copy) @@ -10,7 +10,7 @@ arm/arm/cpufunc_asm_armv7.S standard arm/arm/irq_dispatch.S standard -arm/ti/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/ti/common.c standard arm/ti/ti_cpuid.c standard arm/ti/ti_machdep.c standard Index: freescale/imx/files.imx51 =================================================================== --- freescale/imx/files.imx51 (revision 257529) +++ freescale/imx/files.imx51 (working copy) @@ -11,7 +11,7 @@ arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx51_machdep.c standard arm/freescale/imx/common.c standard -arm/freescale/imx/bus_space.c standard +arm/arm/bus_space-v6.c standard # Dummy serial console #arm/freescale/imx/console.c standard Index: freescale/imx/files.imx53 =================================================================== --- freescale/imx/files.imx53 (revision 257529) +++ freescale/imx/files.imx53 (working copy) @@ -11,7 +11,7 @@ arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx53_machdep.c standard arm/freescale/imx/common.c standard -arm/freescale/imx/bus_space.c standard +arm/arm/bus_space-v6.c standard # Special serial console for debuging early boot code #arm/freescale/imx/console.c standard Index: freescale/imx/files.imx6 =================================================================== --- freescale/imx/files.imx6 (revision 257529) +++ freescale/imx/files.imx6 (working copy) @@ -16,7 +16,7 @@ # arm/arm/gic.c standard arm/arm/pl310.c standard -arm/freescale/imx/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/freescale/imx/common.c standard arm/freescale/imx/imx6_anatop.c standard arm/freescale/imx/imx6_ccm.c standard Index: rockchip/files.rk30xx =================================================================== --- rockchip/files.rk30xx (revision 257529) +++ rockchip/files.rk30xx (working copy) @@ -12,7 +12,7 @@ arm/arm/gic.c standard arm/arm/mpcore_timer.c standard -arm/rockchip/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/rockchip/common.c standard arm/rockchip/rk30xx_machdep.c standard arm/rockchip/rk30xx_pmu.c standard Index: tegra/files.tegra2 =================================================================== --- tegra/files.tegra2 (revision 257529) +++ tegra/files.tegra2 (working copy) @@ -10,7 +10,7 @@ arm/arm/gic.c standard arm/arm/mpcore_timer.c standard -arm/tegra/bus_space.c standard +arm/arm/bus_space-v6.c standard arm/tegra/common.c standard arm/tegra/tegra2_machdep.c standard