Module Name: src Committed By: skrll Date: Fri Apr 21 14:58:35 UTC 2023
Modified Files: src/sys/arch/evbarm/adi_brh: obio_space.c src/sys/arch/evbarm/hdl_g: obio_space.c src/sys/arch/evbarm/ifpga: ifpga_io.c src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c src/sys/arch/evbarm/iq80310: obio_space.c src/sys/arch/evbarm/iq80321: obio_space.c src/sys/arch/evbarm/iyonix: obio_space.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/adi_brh/obio_space.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/hdl_g/obio_space.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/ifpga/ifpga_io.c cvs rdiff -u -r1.14 -r1.15 \ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/iq80310/obio_space.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80321/obio_space.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/iyonix/obio_space.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/evbarm/adi_brh/obio_space.c diff -u src/sys/arch/evbarm/adi_brh/obio_space.c:1.9 src/sys/arch/evbarm/adi_brh/obio_space.c:1.10 --- src/sys/arch/evbarm/adi_brh/obio_space.c:1.9 Fri Mar 16 17:56:32 2018 +++ src/sys/arch/evbarm/adi_brh/obio_space.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $ */ +/* $NetBSD: obio_space.c,v 1.10 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.10 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus endpa = round_page(bpa + size); offset = bpa & PAGE_MASK; startpa = trunc_page(bpa); - + va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY | UVM_KMF_NOWAIT); if (va == 0) @@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_ uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY); } -void +void obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { Index: src/sys/arch/evbarm/hdl_g/obio_space.c diff -u src/sys/arch/evbarm/hdl_g/obio_space.c:1.5 src/sys/arch/evbarm/hdl_g/obio_space.c:1.6 --- src/sys/arch/evbarm/hdl_g/obio_space.c:1.5 Fri Mar 16 17:56:33 2018 +++ src/sys/arch/evbarm/hdl_g/obio_space.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.5 2018/03/16 17:56:33 ryo Exp $ */ +/* $NetBSD: obio_space.c,v 1.6 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.5 2018/03/16 17:56:33 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.6 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus endpa = round_page(bpa + size); offset = bpa & PAGE_MASK; startpa = trunc_page(bpa); - + va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY | UVM_KMF_NOWAIT); if (va == 0) @@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_ uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY); } -void +void obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { Index: src/sys/arch/evbarm/ifpga/ifpga_io.c diff -u src/sys/arch/evbarm/ifpga/ifpga_io.c:1.14 src/sys/arch/evbarm/ifpga/ifpga_io.c:1.15 --- src/sys/arch/evbarm/ifpga/ifpga_io.c:1.14 Mon May 23 19:52:34 2022 +++ src/sys/arch/evbarm/ifpga/ifpga_io.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ifpga_io.c,v 1.14 2022/05/23 19:52:34 andvar Exp $ */ +/* $NetBSD: ifpga_io.c,v 1.15 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 1997 Causality Limited @@ -32,7 +32,7 @@ * 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. - * + * * From arm/footbridge/footbridge_io.c */ @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.14 2022/05/23 19:52:34 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v 1.15 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -274,7 +274,7 @@ ifpga_mem_bs_map(void *t, bus_addr_t bpa /* Now map the pages */ /* The cookie is the physical base address for the I/O area */ while (startpa < endpa) { - /* XXX pmap_kenter_pa maps pages cacheable -- not what + /* XXX pmap_kenter_pa maps pages cacheable -- not what we want. */ pmap_enter(pmap_kernel(), va, (bus_addr_t)t + startpa, VM_PROT_READ | VM_PROT_WRITE, 0); @@ -319,7 +319,7 @@ ifpga_mem_bs_unmap(void *t, bus_space_ha uvm_km_free(kernel_map, startva, endva - startva, UVM_KMF_VAONLY); } -void +void ifpga_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { @@ -346,4 +346,4 @@ ifpga_bs_vaddr(void *t, bus_space_handle void ifpga_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t len, int flags) { -} +} Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.14 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.15 --- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.14 Thu Apr 20 08:28:04 2023 +++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Fri Apr 21 14:58:35 2023 @@ -1,4 +1,4 @@ -/* $Id: imx23_olinuxino_machdep.c,v 1.14 2023/04/20 08:28:04 skrll Exp $ */ +/* $Id: imx23_olinuxino_machdep.c,v 1.15 2023/04/21 14:58:35 skrll Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -92,7 +92,7 @@ do { \ * Static device map for i.MX23 peripheral address space. */ static const struct pmap_devmap devmap[] = { - DEVMAP_ENTRY( + DEVMAP_ENTRY( APBH_BASE, /* Virtual address. */ APBH_BASE, /* Physical address. */ APBH_SIZE + APBX_SIZE /* APBX located after APBH. */ Index: src/sys/arch/evbarm/iq80310/obio_space.c diff -u src/sys/arch/evbarm/iq80310/obio_space.c:1.16 src/sys/arch/evbarm/iq80310/obio_space.c:1.17 --- src/sys/arch/evbarm/iq80310/obio_space.c:1.16 Fri Mar 16 17:56:33 2018 +++ src/sys/arch/evbarm/iq80310/obio_space.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.16 2018/03/16 17:56:33 ryo Exp $ */ +/* $NetBSD: obio_space.c,v 1.17 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.16 2018/03/16 17:56:33 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.17 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -199,7 +199,7 @@ obio_bs_unmap(void *t, bus_space_handle_ uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY); } -void +void obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { Index: src/sys/arch/evbarm/iq80321/obio_space.c diff -u src/sys/arch/evbarm/iq80321/obio_space.c:1.13 src/sys/arch/evbarm/iq80321/obio_space.c:1.14 --- src/sys/arch/evbarm/iq80321/obio_space.c:1.13 Fri Mar 16 17:56:33 2018 +++ src/sys/arch/evbarm/iq80321/obio_space.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.13 2018/03/16 17:56:33 ryo Exp $ */ +/* $NetBSD: obio_space.c,v 1.14 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.13 2018/03/16 17:56:33 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.14 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus endpa = round_page(bpa + size); offset = bpa & PAGE_MASK; startpa = trunc_page(bpa); - + va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY | UVM_KMF_NOWAIT); if (va == 0) @@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_ uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY); } -void +void obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) { Index: src/sys/arch/evbarm/iyonix/obio_space.c diff -u src/sys/arch/evbarm/iyonix/obio_space.c:1.1 src/sys/arch/evbarm/iyonix/obio_space.c:1.2 --- src/sys/arch/evbarm/iyonix/obio_space.c:1.1 Thu Feb 14 21:47:52 2019 +++ src/sys/arch/evbarm/iyonix/obio_space.c Fri Apr 21 14:58:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: obio_space.c,v 1.1 2019/02/14 21:47:52 macallan Exp $ */ +/* $NetBSD: obio_space.c,v 1.2 2023/04/21 14:58:34 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.1 2019/02/14 21:47:52 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio_space.c,v 1.2 2023/04/21 14:58:34 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -153,7 +153,7 @@ obio_bs_map(void *t, bus_addr_t bpa, bus endpa = round_page(bpa + size); offset = bpa & PAGE_MASK; startpa = trunc_page(bpa); - + va = uvm_km_alloc(kernel_map, endpa - startpa, 0, UVM_KMF_VAONLY | UVM_KMF_NOWAIT); if (va == 0) @@ -201,7 +201,7 @@ obio_bs_unmap(void *t, bus_space_handle_ uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY); } -void +void obio_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size) {