From 37e35e27dcc1e1cddbd30fc5bd9e2679e63ae71e Mon Sep 17 00:00:00 2001 From: jsg Date: Sun, 16 May 2021 03:39:27 +0000 Subject: [PATCH] ansi --- sys/arch/arm/arm/arm32_machdep.c | 6 +++--- sys/arch/arm/arm/cpufunc.c | 10 +++++----- sys/arch/arm/arm/stubs.c | 4 ++-- sys/arch/arm/arm/sys_machdep.c | 17 ++++------------- sys/arch/arm/arm/syscall.c | 5 ++--- sys/arch/arm/arm/undefined.c | 4 ++-- sys/arch/arm/cortex/agtimer.c | 4 ++-- sys/arch/arm/cortex/amptimer.c | 4 ++-- sys/arch/arm/include/cpufunc.h | 4 ++-- sys/arch/armv7/armv7/armv7_machdep.h | 4 ++-- sys/arch/armv7/armv7/platform.c | 4 ++-- sys/arch/armv7/exynos/tps65090.c | 4 ++-- sys/arch/armv7/omap/dmtimer.c | 4 ++-- sys/arch/armv7/omap/gptimer.c | 4 ++-- sys/arch/armv7/omap/omap.c | 8 ++++---- 15 files changed, 38 insertions(+), 48 deletions(-) diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c index a8e4a4e0676..89c7cc00d7c 100644 --- a/sys/arch/arm/arm/arm32_machdep.c +++ b/sys/arch/arm/arm/arm32_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arm32_machdep.c,v 1.61 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: arm32_machdep.c,v 1.62 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $ */ /* @@ -172,7 +172,7 @@ arm32_vector_init(vaddr_t va, int which) */ void -halt() +halt(void) { while (1) cpu_sleep(0); @@ -219,7 +219,7 @@ bootsync(int howto) * */ void -cpu_startup() +cpu_startup(void) { u_int loop; paddr_t minaddr; diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c index b45e4190e58..aed243fd0a0 100644 --- a/sys/arch/arm/arm/cpufunc.c +++ b/sys/arch/arm/arm/cpufunc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.c,v 1.56 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: cpufunc.c,v 1.57 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */ /* @@ -252,7 +252,7 @@ arm_get_cachetype_cp15v7(void) /* */ void -armv7_idcache_wbinv_all() +armv7_idcache_wbinv_all(void) { uint32_t arg; arg = 0; @@ -262,7 +262,7 @@ armv7_idcache_wbinv_all() /* brute force cache flushing */ void -armv7_dcache_wbinv_all() +armv7_dcache_wbinv_all(void) { int sets, ways, lvl; int nsets, nways; @@ -307,7 +307,7 @@ armv7_dcache_wbinv_all() */ int -set_cpufuncs() +set_cpufuncs(void) { cputype = cpufunc_id(); cputype &= CPU_ID_CPU_MASK; @@ -355,7 +355,7 @@ set_cpufuncs() */ void -armv7_setup() +armv7_setup(void) { uint32_t auxctrl, auxctrlmask; uint32_t cpuctrl, cpuctrlmask; diff --git a/sys/arch/arm/arm/stubs.c b/sys/arch/arm/arm/stubs.c index 694de65166c..d65822e7fb4 100644 --- a/sys/arch/arm/arm/stubs.c +++ b/sys/arch/arm/arm/stubs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stubs.c,v 1.12 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: stubs.c,v 1.13 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: stubs.c,v 1.14 2003/07/15 00:24:42 lukem Exp $ */ /* @@ -118,7 +118,7 @@ extern char *memhook; /* XXX */ */ void -dumpsys() +dumpsys(void) { const struct bdevsw *bdev; daddr_t blkno; diff --git a/sys/arch/arm/arm/sys_machdep.c b/sys/arch/arm/arm/sys_machdep.c index 52b0b912760..4798edcc8f8 100644 --- a/sys/arch/arm/arm/sys_machdep.c +++ b/sys/arch/arm/arm/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.6 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.7 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: sys_machdep.c,v 1.6 2003/07/15 00:24:42 lukem Exp $ */ /* @@ -56,10 +56,7 @@ static int arm32_sync_icache (struct proc *, char *, register_t *); static int arm32_drain_writebuf (struct proc *, char *, register_t *); static int -arm32_sync_icache(p, args, retval) - struct proc *p; - char *args; - register_t *retval; +arm32_sync_icache(struct proc *p, char *args, register_t *retval) { struct arm_sync_icache_args ua; struct vm_map *map = &p->p_vmspace->vm_map; @@ -108,10 +105,7 @@ out: } static int -arm32_drain_writebuf(p, args, retval) - struct proc *p; - char *args; - register_t *retval; +arm32_drain_writebuf(struct proc *p, char *args, register_t *retval) { /* No args. */ @@ -122,10 +116,7 @@ arm32_drain_writebuf(p, args, retval) } int -sys_sysarch(p, v, retval) - struct proc *p; - void *v; - register_t *retval; +sys_sysarch(struct proc *p, void *v, register_t *retval) { struct sys_sysarch_args /* { syscallarg(int) op; diff --git a/sys/arch/arm/arm/syscall.c b/sys/arch/arm/arm/syscall.c index ada21de8479..1f0f284ee99 100644 --- a/sys/arch/arm/arm/syscall.c +++ b/sys/arch/arm/arm/syscall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.c,v 1.22 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: syscall.c,v 1.23 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: syscall.c,v 1.24 2003/11/14 19:03:17 scw Exp $ */ /*- @@ -181,8 +181,7 @@ swi_handler(trapframe_t *frame) } void -child_return(arg) - void *arg; +child_return(void *arg) { struct proc *p = arg; struct trapframe *frame = p->p_addr->u_pcb.pcb_tf; diff --git a/sys/arch/arm/arm/undefined.c b/sys/arch/arm/arm/undefined.c index a030deef50a..8a02c9d1fa2 100644 --- a/sys/arch/arm/arm/undefined.c +++ b/sys/arch/arm/arm/undefined.c @@ -1,4 +1,4 @@ -/* $OpenBSD: undefined.c,v 1.15 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: undefined.c,v 1.16 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: undefined.c,v 1.22 2003/11/29 22:21:29 bjh21 Exp $ */ /* @@ -121,7 +121,7 @@ gdb_trapper(u_int addr, u_int insn, struct trapframe *frame, int code, uint32_t static struct undefined_handler gdb_uh; void -undefined_init() +undefined_init(void) { int loop; diff --git a/sys/arch/arm/cortex/agtimer.c b/sys/arch/arm/cortex/agtimer.c index 10a5c6b9d21..b2ec10dbc63 100644 --- a/sys/arch/arm/cortex/agtimer.c +++ b/sys/arch/arm/cortex/agtimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agtimer.c,v 1.13 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: agtimer.c,v 1.14 2021/05/16 03:39:27 jsg Exp $ */ /* * Copyright (c) 2011 Dale Rahn * Copyright (c) 2013 Patrick Wildt @@ -270,7 +270,7 @@ agtimer_set_clockrate(int32_t new_frequency) } void -agtimer_cpu_initclocks() +agtimer_cpu_initclocks(void) { struct agtimer_softc *sc = agtimer_cd.cd_devs[0]; struct agtimer_pcpu_softc *pc = &sc->sc_pstat[CPU_INFO_UNIT(curcpu())]; diff --git a/sys/arch/arm/cortex/amptimer.c b/sys/arch/arm/cortex/amptimer.c index 7eaecb0c560..7c5ff9b6aac 100644 --- a/sys/arch/arm/cortex/amptimer.c +++ b/sys/arch/arm/cortex/amptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amptimer.c,v 1.12 2021/03/25 04:12:00 jsg Exp $ */ +/* $OpenBSD: amptimer.c,v 1.13 2021/05/16 03:39:27 jsg Exp $ */ /* * Copyright (c) 2011 Dale Rahn * @@ -340,7 +340,7 @@ amptimer_set_clockrate(int32_t new_frequency) } void -amptimer_cpu_initclocks() +amptimer_cpu_initclocks(void) { struct amptimer_softc *sc = amptimer_cd.cd_devs[0]; struct amptimer_pcpu_softc *pc = &sc->sc_pstat[CPU_INFO_UNIT(curcpu())]; diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h index a13cd82dd52..893f0c68191 100644 --- a/sys/arch/arm/include/cpufunc.h +++ b/sys/arch/arm/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.32 2019/11/07 21:54:49 patrick Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.33 2021/05/16 03:39:27 jsg Exp $ */ /* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */ /* @@ -283,7 +283,7 @@ __set_cpsr_c(u_int bic, u_int eor) } static __inline u_int32_t -__get_cpsr() +__get_cpsr(void) { u_int32_t ret; diff --git a/sys/arch/armv7/armv7/armv7_machdep.h b/sys/arch/armv7/armv7/armv7_machdep.h index aa4bf8cd443..ee04e4efba3 100644 --- a/sys/arch/armv7/armv7/armv7_machdep.h +++ b/sys/arch/armv7/armv7/armv7_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_machdep.h,v 1.13 2017/08/27 12:42:22 kettenis Exp $ */ +/* $OpenBSD: armv7_machdep.h,v 1.14 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon * @@ -23,7 +23,7 @@ void platform_powerdown(void); void platform_watchdog_reset(void); void platform_init_cons(void); void platform_init_mainbus(struct device *); -struct board_dev *platform_board_devs(); +struct board_dev *platform_board_devs(void); extern void (*cpuresetfn)(void); extern void (*powerdownfn)(void); diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c index 19166736a9f..b31051c597f 100644 --- a/sys/arch/armv7/armv7/platform.c +++ b/sys/arch/armv7/armv7/platform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: platform.c,v 1.26 2021/04/24 07:49:11 visa Exp $ */ +/* $OpenBSD: platform.c,v 1.27 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2014 Patrick Wildt * @@ -120,7 +120,7 @@ platform_powerdown(void) } struct board_dev * -platform_board_devs() +platform_board_devs(void) { if (platform && platform->devs) return (platform->devs); diff --git a/sys/arch/armv7/exynos/tps65090.c b/sys/arch/armv7/exynos/tps65090.c index e127bdf268e..d4a3f50e447 100644 --- a/sys/arch/armv7/exynos/tps65090.c +++ b/sys/arch/armv7/exynos/tps65090.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tps65090.c,v 1.4 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: tps65090.c,v 1.5 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2013 Patrick Wildt * @@ -181,7 +181,7 @@ tps65090_fet_get(int fet) } int -tps65090_get_charging() +tps65090_get_charging(void) { struct tps65090_softc *sc = tps65090_sc; uint8_t val = tps65090_read_reg(sc, REG_CG_CTRL0); diff --git a/sys/arch/armv7/omap/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c index 5f4fc94a813..101ab073ea7 100644 --- a/sys/arch/armv7/omap/dmtimer.c +++ b/sys/arch/armv7/omap/dmtimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmtimer.c,v 1.11 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: dmtimer.c,v 1.12 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * Copyright (c) 2013 Raphael Graf @@ -294,7 +294,7 @@ dmtimer_intr(void *frame) */ void -dmtimer_cpu_initclocks() +dmtimer_cpu_initclocks(void) { struct dmtimer_softc *sc = dmtimer_cd.cd_devs[1]; diff --git a/sys/arch/armv7/omap/gptimer.c b/sys/arch/armv7/omap/gptimer.c index 622c71614e1..9a58edd6c7c 100644 --- a/sys/arch/armv7/omap/gptimer.c +++ b/sys/arch/armv7/omap/gptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gptimer.c,v 1.13 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: gptimer.c,v 1.14 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * @@ -279,7 +279,7 @@ gptimer_intr(void *frame) */ void -gptimer_cpu_initclocks() +gptimer_cpu_initclocks(void) { stathz = 128; profhz = 1024; diff --git a/sys/arch/armv7/omap/omap.c b/sys/arch/armv7/omap/omap.c index 5ff3a18f2f5..74f476d7992 100644 --- a/sys/arch/armv7/omap/omap.c +++ b/sys/arch/armv7/omap/omap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omap.c,v 1.22 2021/04/02 03:02:46 tb Exp $ */ +/* $OpenBSD: omap.c,v 1.23 2021/05/16 03:39:28 jsg Exp $ */ /* * Copyright (c) 2005,2008 Dale Rahn * @@ -26,9 +26,9 @@ #include int omap_match(struct device *, void *, void *); -void omap3_init(); -void omap4_init(); -void am335x_init(); +void omap3_init(void); +void omap4_init(void); +void am335x_init(void); struct cfattach omap_ca = { sizeof(struct armv7_softc), omap_match, armv7_attach -- 2.20.1