diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/armv7/sunxi/sxiintc.c | 8 | ||||
| -rw-r--r-- | sys/arch/armv7/sunxi/sxitimer.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/vexpress/sysreg.c | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/armv7/sunxi/sxiintc.c b/sys/arch/armv7/sunxi/sxiintc.c index 3ba1b307233..2f0384a28b2 100644 --- a/sys/arch/armv7/sunxi/sxiintc.c +++ b/sys/arch/armv7/sunxi/sxiintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiintc.c,v 1.4 2018/06/04 09:24:49 kettenis Exp $ */ +/* $OpenBSD: sxiintc.c,v 1.5 2019/05/06 03:49:53 mlarkin Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Artturi Alm @@ -254,7 +254,7 @@ sxiintc_calc_masks(void) for (; i < NIPL; i++) sxiintc_imask[IRQ2REG32(irq)][i] |= (1 << IRQ2BIT32(irq)); - /* XXX - set enable/disable, priority */ + /* XXX - set enable/disable, priority */ } sxiintc_setipl(ci->ci_cpl); @@ -297,7 +297,7 @@ sxiintc_splraise(int new) new = old; sxiintc_setipl(new); - + return (old); } @@ -365,7 +365,7 @@ sxiintc_irq_handler(void *frame) else arg = frame; - if (ih->ih_func(arg)) + if (ih->ih_func(arg)) ih->ih_count.ec_count++; } sxiintc_splx(s); diff --git a/sys/arch/armv7/sunxi/sxitimer.c b/sys/arch/armv7/sunxi/sxitimer.c index 21cf51da690..14a243c78d0 100644 --- a/sys/arch/armv7/sunxi/sxitimer.c +++ b/sys/arch/armv7/sunxi/sxitimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxitimer.c,v 1.12 2018/06/04 09:25:16 kettenis Exp $ */ +/* $OpenBSD: sxitimer.c,v 1.13 2019/05/06 03:49:53 mlarkin Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Raphael Graf <r@undefined.ch> @@ -267,7 +267,7 @@ sxitimer_cpu_initclocks(void) ctrl | TIMER_ENABLE | TIMER_RELOAD | TIMER_SINGLESHOT); } -/* +/* * See comment in arm/xscale/i80321_clock.c * * Counter is count up, but with autoreload timers it is not possible diff --git a/sys/arch/armv7/vexpress/sysreg.c b/sys/arch/armv7/vexpress/sysreg.c index 622ebf83926..1acf5334757 100644 --- a/sys/arch/armv7/vexpress/sysreg.c +++ b/sys/arch/armv7/vexpress/sysreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysreg.c,v 1.3 2016/10/09 01:40:43 jsg Exp $ */ +/* $OpenBSD: sysreg.c,v 1.4 2019/05/06 03:50:48 mlarkin Exp $ */ /* * Copyright (c) 2015 Jonathan Gray <jsg@openbsd.org> @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/device.h> -#include <machine/bus.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/device.h> +#include <machine/bus.h> #include <machine/fdt.h> #include <armv7/armv7/armv7var.h> |