Module Name: src
Committed By: skrll
Date: Fri Apr 21 15:00:48 UTC 2023
Modified Files:
src/sys/arch/arm/at91: at91_bus_space.c at91busvar.h at91rm9200bus.c
at91sam9260bus.c at91sam9261bus.c
src/sys/arch/arm/broadcom: bcmgen_space.c
src/sys/arch/arm/gemini: gemini_space.c
src/sys/arch/arm/imx: imx_space.c
src/sys/arch/arm/ixp12x0: ixp12x0_io.c
src/sys/arch/arm/sa11x0: sa11x0_io.c
src/sys/arch/arm/xscale: ixp425_pci_space.c ixp425_space.c
pxa2x0_space.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/at91/at91_bus_space.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/at91/at91busvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91rm9200bus.c \
src/sys/arch/arm/at91/at91sam9261bus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/at91/at91sam9260bus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcmgen_space.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/gemini_space.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imx_space.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/ixp12x0/ixp12x0_io.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sa11x0/sa11x0_io.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/ixp425_pci_space.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/ixp425_space.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_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/arm/at91/at91_bus_space.c
diff -u src/sys/arch/arm/at91/at91_bus_space.c:1.5 src/sys/arch/arm/at91/at91_bus_space.c:1.6
--- src/sys/arch/arm/at91/at91_bus_space.c:1.5 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/at91/at91_bus_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: at91_bus_space.c,v 1.5 2018/03/16 17:56:31 ryo Exp $ */
+ /* $NetBSD: at91_bus_space.c,v 1.6 2023/04/21 15:00:48 skrll Exp $ */
/*
* Based on ep93xx_space.c
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.5 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.6 2023/04/21 15:00:48 skrll Exp $");
/*
* bus_space I/O functions for ep93xx
@@ -201,7 +201,7 @@ at91_bs_alloc(void *t, bus_addr_t rstart
panic("at91_bs_alloc(): not implemented\n");
}
-void
+void
at91_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("at91_bs_free(): not implemented\n");
@@ -233,5 +233,5 @@ at91_bs_barrier(void *t, bus_space_handl
bus_size_t len, int flags)
{
/* NULL */
-}
+}
/* End of at91_io.c */
Index: src/sys/arch/arm/at91/at91busvar.h
diff -u src/sys/arch/arm/at91/at91busvar.h:1.7 src/sys/arch/arm/at91/at91busvar.h:1.8
--- src/sys/arch/arm/at91/at91busvar.h:1.7 Tue Jul 16 14:41:43 2019
+++ src/sys/arch/arm/at91/at91busvar.h Fri Apr 21 15:00:48 2023
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
-/* $NetBSD: at91busvar.h,v 1.7 2019/07/16 14:41:43 skrll Exp $ */
+/* $Id: at91busvar.h,v 1.8 2023/04/21 15:00:48 skrll Exp $ */
+/* $NetBSD: at91busvar.h,v 1.8 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -150,7 +150,7 @@ at91_gpio_mask(int pid)
return (*at91bus_tag->gpio_mask)(pid);
}
-static __inline void
+static __inline void
at91_intr_init(void)
{
return (*at91bus_tag->intr_init)();
Index: src/sys/arch/arm/at91/at91rm9200bus.c
diff -u src/sys/arch/arm/at91/at91rm9200bus.c:1.2 src/sys/arch/arm/at91/at91rm9200bus.c:1.3
--- src/sys/arch/arm/at91/at91rm9200bus.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91rm9200bus.c Fri Apr 21 15:00:48 2023
@@ -1,7 +1,7 @@
-/* $Id: at91rm9200bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91rm9200bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91rm9200bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91rm9200bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -88,7 +88,7 @@ at91pio_port at91rm9200bus_pio_port(int
case PID_PIOD: return AT91_PIOD;
default: panic("%s: pid %d not valid", __FUNCTION__, pid);
}
-
+
}
uint32_t at91rm9200bus_gpio_mask(int pid)
@@ -135,7 +135,7 @@ const char *at91rm9200bus_peripheral_nam
}
}
-void at91rm9200bus_search_peripherals(device_t self,
+void at91rm9200bus_search_peripherals(device_t self,
device_t (*found_func)(device_t, bus_addr_t, int))
{
static const struct {
Index: src/sys/arch/arm/at91/at91sam9261bus.c
diff -u src/sys/arch/arm/at91/at91sam9261bus.c:1.2 src/sys/arch/arm/at91/at91sam9261bus.c:1.3
--- src/sys/arch/arm/at91/at91sam9261bus.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91sam9261bus.c Fri Apr 21 15:00:48 2023
@@ -1,7 +1,7 @@
-/* $Id: at91sam9261bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91sam9261bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91sam9261bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91sam9261bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,7 +87,7 @@ at91pio_port at91sam9261bus_pio_port(int
case PID_PIOC: return AT91_PIOC;
default: panic("%s: pid %d not valid", __FUNCTION__, pid);
}
-
+
}
uint32_t at91sam9261bus_gpio_mask(int pid)
@@ -126,7 +126,7 @@ const char *at91sam9261bus_peripheral_na
}
}
-void at91sam9261bus_search_peripherals(device_t self,
+void at91sam9261bus_search_peripherals(device_t self,
device_t (*found_func)(device_t, bus_addr_t, int))
{
static const struct {
Index: src/sys/arch/arm/at91/at91sam9260bus.c
diff -u src/sys/arch/arm/at91/at91sam9260bus.c:1.1 src/sys/arch/arm/at91/at91sam9260bus.c:1.2
--- src/sys/arch/arm/at91/at91sam9260bus.c:1.1 Fri Nov 4 17:20:54 2011
+++ src/sys/arch/arm/at91/at91sam9260bus.c Fri Apr 21 15:00:48 2023
@@ -1,11 +1,11 @@
-/* $NetBSD: at91sam9260bus.c,v 1.1 2011/11/04 17:20:54 aymeric Exp $ */
+/* $NetBSD: at91sam9260bus.c,v 1.2 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copied from at91sam9261bus.c
* Adaptation to AT91SAM9260 by Aymeric Vincent is in the public domain.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91sam9260bus.c,v 1.1 2011/11/04 17:20:54 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91sam9260bus.c,v 1.2 2023/04/21 15:00:48 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -83,7 +83,7 @@ at91pio_port at91sam9260bus_pio_port(int
case PID_PIOC: return AT91_PIOC;
default: panic("%s: pid %d not valid", __FUNCTION__, pid);
}
-
+
}
uint32_t at91sam9260bus_gpio_mask(int pid) {
@@ -124,7 +124,7 @@ const char *at91sam9260bus_peripheral_na
}
}
-void at91sam9260bus_search_peripherals(device_t self,
+void at91sam9260bus_search_peripherals(device_t self,
device_t found_func(device_t, bus_addr_t, int)) {
static const struct {
bus_addr_t addr;
Index: src/sys/arch/arm/broadcom/bcmgen_space.c
diff -u src/sys/arch/arm/broadcom/bcmgen_space.c:1.7 src/sys/arch/arm/broadcom/bcmgen_space.c:1.8
--- src/sys/arch/arm/broadcom/bcmgen_space.c:1.7 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/broadcom/bcmgen_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmgen_space.c,v 1.7 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: bcmgen_space.c,v 1.8 2023/04/21 15:00:48 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcmgen_space.c,v 1.7 2020/10/30 18:54:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcmgen_space.c,v 1.8 2023/04/21 15:00:48 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,7 +240,7 @@ bcmgen_bs_barrier(void *t, bus_space_han
bus_size_t len, int flags)
{
flags &= BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE;
-
+
if (flags)
dsb(sy);
}
Index: src/sys/arch/arm/gemini/gemini_space.c
diff -u src/sys/arch/arm/gemini/gemini_space.c:1.5 src/sys/arch/arm/gemini/gemini_space.c:1.6
--- src/sys/arch/arm/gemini/gemini_space.c:1.5 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/gemini/gemini_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_space.c,v 1.5 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: gemini_space.c,v 1.6 2023/04/21 15:00:48 skrll Exp $ */
/* adapted from:
* NetBSD: pxa2x0_space.c,v 1.8 2005/11/24 13:08:32 yamt Exp
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.5 2018/03/16 17:56:31 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_space.c,v 1.6 2023/04/21 15:00:48 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,7 +261,7 @@ gemini_bs_alloc(void *t, bus_addr_t rsta
panic("gemini_io_bs_alloc(): not implemented\n");
}
-void
+void
gemini_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Index: src/sys/arch/arm/imx/imx_space.c
diff -u src/sys/arch/arm/imx/imx_space.c:1.6 src/sys/arch/arm/imx/imx_space.c:1.7
--- src/sys/arch/arm/imx/imx_space.c:1.6 Fri Mar 16 17:56:31 2018
+++ src/sys/arch/arm/imx/imx_space.c Fri Apr 21 15:00:48 2023
@@ -1,7 +1,7 @@
-/* $Id: imx_space.c,v 1.6 2018/03/16 17:56:31 ryo Exp $ */
+/* $Id: imx_space.c,v 1.7 2023/04/21 15:00:48 skrll Exp $ */
/* derived from: */
-/* $NetBSD: imx_space.c,v 1.6 2018/03/16 17:56:31 ryo Exp $ */
+/* $NetBSD: imx_space.c,v 1.7 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -291,7 +291,7 @@ imx_bs_alloc(void *t, bus_addr_t rstart,
panic("imx_io_bs_alloc(): not implemented\n");
}
-void
+void
imx_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
Index: src/sys/arch/arm/ixp12x0/ixp12x0_io.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.18 src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.19
--- src/sys/arch/arm/ixp12x0/ixp12x0_io.c:1.18 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/arm/ixp12x0/ixp12x0_io.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_io.c,v 1.18 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: ixp12x0_io.c,v 1.19 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.18 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c,v 1.19 2023/04/21 15:00:48 skrll Exp $");
/*
* bus_space I/O functions for ixp12x0
@@ -151,7 +151,7 @@ ixp12x0_bs_map(void *t, bus_addr_t bpa,
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)
@@ -213,7 +213,7 @@ ixp12x0_bs_alloc(void *t,
panic("ixp12x0_bs_alloc(): not implemented\n");
}
-void
+void
ixp12x0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("ixp12x0_bs_free(): not implemented\n");
@@ -223,6 +223,6 @@ void
ixp12x0_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t len, int flags)
{
/* NULL */
-}
+}
/* End of ixp12x0_io.c */
Index: src/sys/arch/arm/sa11x0/sa11x0_io.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_io.c:1.21 src/sys/arch/arm/sa11x0/sa11x0_io.c:1.22
--- src/sys/arch/arm/sa11x0/sa11x0_io.c:1.21 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/arm/sa11x0/sa11x0_io.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_io.c,v 1.21 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: sa11x0_io.c,v 1.22 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.21 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,v 1.22 2023/04/21 15:00:48 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -205,7 +205,7 @@ sa11x0_bs_unmap(void *t, bus_space_handl
uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
}
-void
+void
sa11x0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
@@ -241,4 +241,4 @@ sa11x0_bs_barrier(void *t, bus_space_han
bus_size_t len, int flags)
{
-}
+}
Index: src/sys/arch/arm/xscale/ixp425_pci_space.c
diff -u src/sys/arch/arm/xscale/ixp425_pci_space.c:1.14 src/sys/arch/arm/xscale/ixp425_pci_space.c:1.15
--- src/sys/arch/arm/xscale/ixp425_pci_space.c:1.14 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/arm/xscale/ixp425_pci_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_pci_space.c,v 1.14 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: ixp425_pci_space.c,v 1.15 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.14 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci_space.c,v 1.15 2023/04/21 15:00:48 skrll Exp $");
/*
* bus_space PCI functions for ixp425
@@ -210,7 +210,7 @@ ixp425_pci_bs_barrier(void *t, bus_space
bus_size_t len, int flags)
{
/* NULL */
-}
+}
paddr_t
ixp425_pci_bs_mmap(void *t, bus_addr_t addr, off_t off, int prot, int flags)
@@ -344,7 +344,7 @@ _pci_io_bs_w_2(void *v, bus_space_handle
n = (ioh + off) % 4;
be = (0xf & ~((1U << n) | (1U << (n + 1)))) << NP_CBE_SHIFT;
data = val << (8 * n);
-
+
PCI_CONF_LOCK(s);
CSR_WRITE_4(PCI_NP_AD, (ioh + off) & ~3);
CSR_WRITE_4(PCI_NP_CBE, be | COMMAND_NP_IO_WRITE);
@@ -442,7 +442,7 @@ ixp425_pci_mem_bs_alloc(void *t, bus_add
panic("ixp425_mem_bs_alloc(): not implemented\n");
}
-void
+void
ixp425_pci_mem_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("ixp425_mem_bs_free(): not implemented\n");
Index: src/sys/arch/arm/xscale/ixp425_space.c
diff -u src/sys/arch/arm/xscale/ixp425_space.c:1.9 src/sys/arch/arm/xscale/ixp425_space.c:1.10
--- src/sys/arch/arm/xscale/ixp425_space.c:1.9 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/arm/xscale/ixp425_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: ixp425_space.c,v 1.10 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_space.c,v 1.9 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_space.c,v 1.10 2023/04/21 15:00:48 skrll Exp $");
/*
* bus_space I/O functions for ixp425
@@ -197,7 +197,7 @@ ixp425_bs_alloc(void *t, bus_addr_t rsta
panic("ixp425_bs_alloc(): not implemented\n");
}
-void
+void
ixp425_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
panic("ixp425_bs_free(): not implemented\n");
@@ -229,5 +229,5 @@ ixp425_bs_barrier(void *t, bus_space_han
bus_size_t len, int flags)
{
/* NULL */
-}
+}
/* End of ixp425_space.c */
Index: src/sys/arch/arm/xscale/pxa2x0_space.c
diff -u src/sys/arch/arm/xscale/pxa2x0_space.c:1.13 src/sys/arch/arm/xscale/pxa2x0_space.c:1.14
--- src/sys/arch/arm/xscale/pxa2x0_space.c:1.13 Fri Mar 16 17:56:32 2018
+++ src/sys/arch/arm/xscale/pxa2x0_space.c Fri Apr 21 15:00:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_space.c,v 1.13 2018/03/16 17:56:32 ryo Exp $ */
+/* $NetBSD: pxa2x0_space.c,v 1.14 2023/04/21 15:00:48 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.13 2018/03/16 17:56:32 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_space.c,v 1.14 2023/04/21 15:00:48 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,7 +261,7 @@ pxa2x0_bs_alloc(void *t, bus_addr_t rsta
panic("pxa2x0_io_bs_alloc(): not implemented\n");
}
-void
+void
pxa2x0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
{
