On Mon, Jul 03, 2017 at 01:30:09AM +0300, Artturi Alm wrote:
> Hi,
>
> would anyone be willing to accept diffs to recover from this? I mean
> the overlooking of this from style(9), that's making my eyes bleed:
> "There should be no space between the function name and
> the argument list."
> ^about prototypes.
>
> tbh., i wanted to punch someone in the face when i first noticed
> how wide spread it had gotten, and decided that i will never look
> at blame for who came up w/it nor ok'ed it - the damage is done,
> and hate doesn't help:)
>
> -Artturi
how embarassing. now when i look at the list of files affected,
i think this has been there all the time, and i simply had something
like the diff belowi by mistake in my apply-on-co/-dir on my old machine,
where i mostly had diffs i could not justify w/anything other than 'i like',
which should not be the case with this one, I'm sorry for the last mail.
absolutely nothing but removals of whitespace between
function_name and (arg_list); in the diff.
-Artturi
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index 44ae69fa7f9..0f846724767 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -110,9 +110,9 @@ struct consdev *cn_tab;
/* Prototypes */
-void data_abort_handler (trapframe_t *frame);
-void prefetch_abort_handler (trapframe_t *frame);
-extern void configure (void);
+void data_abort_handler(trapframe_t *frame);
+void prefetch_abort_handler(trapframe_t *frame);
+extern void configure(void);
/*
* arm32_vector_init:
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index c91108e7066..4bbf6ff2197 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -147,7 +147,7 @@ int arm_icache_min_line_size = 32;
int arm_dcache_min_line_size = 32;
int arm_idcache_min_line_size = 32;
-void arm_get_cachetype_cp15v7 (void);
+void arm_get_cachetype_cp15v7(void);
int arm_dcache_l2_nsets;
int arm_dcache_l2_assoc;
int arm_dcache_l2_linesize;
diff --git a/sys/arch/arm/arm/db_interface.c b/sys/arch/arm/arm/db_interface.c
index 322eb123bf6..cc117e6c3bd 100644
--- a/sys/arch/arm/arm/db_interface.c
+++ b/sys/arch/arm/arm/db_interface.c
@@ -56,12 +56,12 @@
static long nil;
-int db_access_und_sp (struct db_variable *, db_expr_t *, int);
-int db_access_abt_sp (struct db_variable *, db_expr_t *, int);
-int db_access_irq_sp (struct db_variable *, db_expr_t *, int);
-u_int db_fetch_reg (int, db_regs_t *);
+int db_access_und_sp(struct db_variable *, db_expr_t *, int);
+int db_access_abt_sp(struct db_variable *, db_expr_t *, int);
+int db_access_irq_sp(struct db_variable *, db_expr_t *, int);
+u_int db_fetch_reg(int, db_regs_t *);
-int db_trapper (u_int, u_int, trapframe_t *, int);
+int db_trapper(u_int, u_int, trapframe_t *, int);
struct db_variable db_regs[] = {
{ "spsr", (long *)&ddb_regs.tf_spsr, FCN_NULL, },
diff --git a/sys/arch/arm/arm/sys_machdep.c b/sys/arch/arm/arm/sys_machdep.c
index bdb1c54dddd..cba475d411f 100644
--- a/sys/arch/arm/arm/sys_machdep.c
+++ b/sys/arch/arm/arm/sys_machdep.c
@@ -53,8 +53,8 @@
#include <machine/sysarch.h>
/* Prototypes */
-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(struct proc *, char *, register_t *);
+static int arm32_drain_writebuf(struct proc *, char *, register_t *);
static int
arm32_sync_icache(p, args, retval)
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 9b2a00a92f5..18c76594bad 100644
--- a/sys/arch/arm/arm/vm_machdep.c
+++ b/sys/arch/arm/arm/vm_machdep.c
@@ -64,10 +64,10 @@
extern pv_addr_t systempage;
-int process_read_regs (struct proc *p, struct reg *regs);
-int process_read_fpregs (struct proc *p, struct fpreg *regs);
+int process_read_regs(struct proc *p, struct reg *regs);
+int process_read_fpregs(struct proc *p, struct fpreg *regs);
-extern void proc_trampoline (void);
+extern void proc_trampoline(void);
/*
* Special compilation symbols:
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index bb540d8acac..5b08a549a8d 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -93,118 +93,118 @@ struct bus_space {
void *bs_cookie;
/* mapping/unmapping */
- int (*bs_map) (void *, uint64_t, bus_size_t,
+ int (*bs_map)(void *, uint64_t, bus_size_t,
int, bus_space_handle_t *);
- void (*bs_unmap) (void *, bus_space_handle_t,
+ void (*bs_unmap)(void *, bus_space_handle_t,
bus_size_t);
- int (*bs_subregion) (void *, bus_space_handle_t,
+ int (*bs_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
/* allocation/deallocation */
- int (*bs_alloc) (void *, bus_addr_t, bus_addr_t,
+ int (*bs_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int,
bus_addr_t *, bus_space_handle_t *);
- void (*bs_free) (void *, bus_space_handle_t,
+ void (*bs_free)(void *, bus_space_handle_t,
bus_size_t);
/* get kernel virtual address */
- void * (*bs_vaddr) (void *, bus_space_handle_t);
+ void * (*bs_vaddr)(void *, bus_space_handle_t);
/* mmap bus space for user */
- paddr_t (*bs_mmap) (void *, bus_addr_t, off_t, int, int);
+ paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
- void (*bs_barrier) (void *, bus_space_handle_t,
+ void (*bs_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
- u_int8_t (*bs_r_1) (void *, bus_space_handle_t,
+ u_int8_t (*bs_r_1)(void *, bus_space_handle_t,
bus_size_t);
- u_int16_t (*bs_r_2) (void *, bus_space_handle_t,
+ u_int16_t (*bs_r_2)(void *, bus_space_handle_t,
bus_size_t);
- u_int32_t (*bs_r_4) (void *, bus_space_handle_t,
+ u_int32_t (*bs_r_4)(void *, bus_space_handle_t,
bus_size_t);
- u_int64_t (*bs_r_8) (void *, bus_space_handle_t,
+ u_int64_t (*bs_r_8)(void *, bus_space_handle_t,
bus_size_t);
/* read multiple */
- void (*bs_rm_1) (void *, bus_space_handle_t,
+ void (*bs_rm_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rm_2) (void *, bus_space_handle_t,
+ void (*bs_rm_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rm_4) (void *, bus_space_handle_t,
+ void (*bs_rm_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rm_8) (void *, bus_space_handle_t,
+ void (*bs_rm_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t *, bus_size_t);
/* read region */
- void (*bs_rr_1) (void *, bus_space_handle_t,
+ void (*bs_rr_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t *, bus_size_t);
- void (*bs_rr_2) (void *, bus_space_handle_t,
+ void (*bs_rr_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t *, bus_size_t);
- void (*bs_rr_4) (void *, bus_space_handle_t,
+ void (*bs_rr_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t *, bus_size_t);
- void (*bs_rr_8) (void *, bus_space_handle_t,
+ void (*bs_rr_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
- void (*bs_w_1) (void *, bus_space_handle_t,
+ void (*bs_w_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t);
- void (*bs_w_2) (void *, bus_space_handle_t,
+ void (*bs_w_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t);
- void (*bs_w_4) (void *, bus_space_handle_t,
+ void (*bs_w_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t);
- void (*bs_w_8) (void *, bus_space_handle_t,
+ void (*bs_w_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t);
/* write multiple */
- void (*bs_wm_1) (void *, bus_space_handle_t,
+ void (*bs_wm_1)(void *, bus_space_handle_t,
bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wm_2) (void *, bus_space_handle_t,
+ void (*bs_wm_2)(void *, bus_space_handle_t,
bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wm_4) (void *, bus_space_handle_t,
+ void (*bs_wm_4)(void *, bus_space_handle_t,
bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wm_8) (void *, bus_space_handle_t,
+ void (*bs_wm_8)(void *, bus_space_handle_t,
bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
- void (*bs_wr_1) (void *, bus_space_handle_t,
+ void (*bs_wr_1)(void *, bus_space_handle_t,
bus_size_t, const u_int8_t *, bus_size_t);
- void (*bs_wr_2) (void *, bus_space_handle_t,
+ void (*bs_wr_2)(void *, bus_space_handle_t,
bus_size_t, const u_int16_t *, bus_size_t);
- void (*bs_wr_4) (void *, bus_space_handle_t,
+ void (*bs_wr_4)(void *, bus_space_handle_t,
bus_size_t, const u_int32_t *, bus_size_t);
- void (*bs_wr_8) (void *, bus_space_handle_t,
+ void (*bs_wr_8)(void *, bus_space_handle_t,
bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
- void (*bs_sm_1) (void *, bus_space_handle_t,
+ void (*bs_sm_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t, bus_size_t);
- void (*bs_sm_2) (void *, bus_space_handle_t,
+ void (*bs_sm_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t, bus_size_t);
- void (*bs_sm_4) (void *, bus_space_handle_t,
+ void (*bs_sm_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
- void (*bs_sm_8) (void *, bus_space_handle_t,
+ void (*bs_sm_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
/* set region */
- void (*bs_sr_1) (void *, bus_space_handle_t,
+ void (*bs_sr_1)(void *, bus_space_handle_t,
bus_size_t, u_int8_t, bus_size_t);
- void (*bs_sr_2) (void *, bus_space_handle_t,
+ void (*bs_sr_2)(void *, bus_space_handle_t,
bus_size_t, u_int16_t, bus_size_t);
- void (*bs_sr_4) (void *, bus_space_handle_t,
+ void (*bs_sr_4)(void *, bus_space_handle_t,
bus_size_t, u_int32_t, bus_size_t);
- void (*bs_sr_8) (void *, bus_space_handle_t,
+ void (*bs_sr_8)(void *, bus_space_handle_t,
bus_size_t, u_int64_t, bus_size_t);
/* copy */
- void (*bs_c_1) (void *, bus_space_handle_t, bus_size_t,
+ void (*bs_c_1)(void *, bus_space_handle_t, bus_size_t,
bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_2) (void *, bus_space_handle_t, bus_size_t,
+ void (*bs_c_2)(void *, bus_space_handle_t, bus_size_t,
bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_4) (void *, bus_space_handle_t, bus_size_t,
+ void (*bs_c_4)(void *, bus_space_handle_t, bus_size_t,
bus_space_handle_t, bus_size_t, bus_size_t);
- void (*bs_c_8) (void *, bus_space_handle_t, bus_size_t,
+ void (*bs_c_8)(void *, bus_space_handle_t, bus_size_t,
bus_space_handle_t, bus_size_t, bus_size_t);
};
@@ -373,183 +373,183 @@ struct bus_space {
*/
#define bs_map_proto(f)
\
-int __bs_c(f,_bs_map) (void *t, uint64_t addr, \
+int __bs_c(f,_bs_map)(void *t, uint64_t addr, \
bus_size_t size, int flags, bus_space_handle_t *bshp);
#define bs_unmap_proto(f) \
-void __bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_unmap)(void *t, bus_space_handle_t bsh, \
bus_size_t size);
#define bs_subregion_proto(f) \
-int __bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh, \
+int __bs_c(f,_bs_subregion)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, bus_size_t size, \
bus_space_handle_t *nbshp);
#define bs_alloc_proto(f) \
-int __bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart, \
+int __bs_c(f,_bs_alloc)(void *t, bus_addr_t rstart, \
bus_addr_t rend, bus_size_t size, bus_size_t align, \
bus_size_t boundary, int flags, bus_addr_t *addrp, \
bus_space_handle_t *bshp);
#define bs_free_proto(f) \
-void __bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_free)(void *t, bus_space_handle_t bsh, \
bus_size_t size);
#define bs_vaddr_proto(f) \
-void * __bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh);
+void * __bs_c(f,_bs_vaddr)(void *t, bus_space_handle_t bsh);
#define bs_mmap_proto(f) \
-paddr_t __bs_c(f,_bs_mmap) (void *, bus_addr_t, off_t, int, int);
+paddr_t __bs_c(f,_bs_mmap)(void *, bus_addr_t, off_t, int, int);
#define bs_barrier_proto(f) \
-void __bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_barrier)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, bus_size_t len, int flags);
#define bs_r_1_proto(f)
\
-u_int8_t __bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh, \
+u_int8_t __bs_c(f,_bs_r_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset);
#define bs_r_2_proto(f)
\
-u_int16_t __bs_c(f,_bs_r_2) (void *t, bus_space_handle_t bsh, \
+u_int16_t __bs_c(f,_bs_r_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset);
#define bs_r_4_proto(f)
\
-u_int32_t __bs_c(f,_bs_r_4) (void *t, bus_space_handle_t bsh, \
+u_int32_t __bs_c(f,_bs_r_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset);
#define bs_r_8_proto(f)
\
-u_int64_t __bs_c(f,_bs_r_8) (void *t, bus_space_handle_t bsh, \
+u_int64_t __bs_c(f,_bs_r_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset);
#define bs_w_1_proto(f)
\
-void __bs_c(f,_bs_w_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_w_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int8_t value);
#define bs_w_2_proto(f)
\
-void __bs_c(f,_bs_w_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_w_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int16_t value);
#define bs_w_4_proto(f)
\
-void __bs_c(f,_bs_w_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_w_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int32_t value);
#define bs_w_8_proto(f)
\
-void __bs_c(f,_bs_w_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_w_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int64_t value);
#define bs_rm_1_proto(f)
\
-void __bs_c(f,_bs_rm_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_rm_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int8_t *addr, bus_size_t count);
#define bs_rm_2_proto(f)
\
-void __bs_c(f,_bs_rm_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_rm_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int16_t *addr, bus_size_t count);
#define bs_rm_4_proto(f)
\
-void __bs_c(f,_bs_rm_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_rm_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int32_t *addr, bus_size_t count);
#define bs_rm_8_proto(f)
\
-void __bs_c(f,_bs_rm_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_rm_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int64_t *addr, bus_size_t count);
#define bs_wm_1_proto(f)
\
-void __bs_c(f,_bs_wm_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_wm_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int8_t *addr, bus_size_t count);
#define bs_wm_2_proto(f)
\
-void __bs_c(f,_bs_wm_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_wm_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int16_t *addr, bus_size_t count);
#define bs_wm_4_proto(f)
\
-void __bs_c(f,_bs_wm_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_wm_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int32_t *addr, bus_size_t count);
#define bs_wm_8_proto(f)
\
-void __bs_c(f,_bs_wm_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_wm_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int64_t *addr, bus_size_t count);
#define bs_rr_1_proto(f)
\
-void __bs_c(f, _bs_rr_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_rr_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int8_t *addr, bus_size_t count);
#define bs_rr_2_proto(f)
\
-void __bs_c(f, _bs_rr_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_rr_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int16_t *addr, bus_size_t count);
#define bs_rr_4_proto(f)
\
-void __bs_c(f, _bs_rr_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_rr_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int32_t *addr, bus_size_t count);
#define bs_rr_8_proto(f)
\
-void __bs_c(f, _bs_rr_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_rr_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int64_t *addr, bus_size_t count);
#define bs_wr_1_proto(f)
\
-void __bs_c(f, _bs_wr_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_wr_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int8_t *addr, bus_size_t count);
#define bs_wr_2_proto(f)
\
-void __bs_c(f, _bs_wr_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_wr_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int16_t *addr, bus_size_t count);
#define bs_wr_4_proto(f)
\
-void __bs_c(f, _bs_wr_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_wr_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int32_t *addr, bus_size_t count);
#define bs_wr_8_proto(f)
\
-void __bs_c(f, _bs_wr_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f, _bs_wr_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, const u_int64_t *addr, bus_size_t count);
#define bs_sm_1_proto(f)
\
-void __bs_c(f,_bs_sm_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sm_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int8_t value, bus_size_t count);
#define bs_sm_2_proto(f)
\
-void __bs_c(f,_bs_sm_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sm_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int16_t value, bus_size_t count);
#define bs_sm_4_proto(f)
\
-void __bs_c(f,_bs_sm_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sm_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int32_t value, bus_size_t count);
#define bs_sm_8_proto(f)
\
-void __bs_c(f,_bs_sm_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sm_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int64_t value, bus_size_t count);
#define bs_sr_1_proto(f)
\
-void __bs_c(f,_bs_sr_1) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sr_1)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int8_t value, bus_size_t count);
#define bs_sr_2_proto(f)
\
-void __bs_c(f,_bs_sr_2) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sr_2)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int16_t value, bus_size_t count);
#define bs_sr_4_proto(f)
\
-void __bs_c(f,_bs_sr_4) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sr_4)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int32_t value, bus_size_t count);
#define bs_sr_8_proto(f)
\
-void __bs_c(f,_bs_sr_8) (void *t, bus_space_handle_t bsh, \
+void __bs_c(f,_bs_sr_8)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, u_int64_t value, bus_size_t count);
#define bs_c_1_proto(f)
\
-void __bs_c(f,_bs_c_1) (void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_1)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
bus_size_t offset2, bus_size_t count);
#define bs_c_2_proto(f)
\
-void __bs_c(f,_bs_c_2) (void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_2)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
bus_size_t offset2, bus_size_t count);
#define bs_c_4_proto(f)
\
-void __bs_c(f,_bs_c_4) (void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_4)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
bus_size_t offset2, bus_size_t count);
#define bs_c_8_proto(f)
\
-void __bs_c(f,_bs_c_8) (void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_8)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
bus_size_t offset2, bus_size_t count);
@@ -698,32 +698,32 @@ struct arm32_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) (bus_dma_tag_t, bus_size_t, int,
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
bus_size_t, bus_size_t, int, bus_dmamap_t *);
- void (*_dmamap_destroy) (bus_dma_tag_t, bus_dmamap_t);
- int (*_dmamap_load) (bus_dma_tag_t, bus_dmamap_t, void *,
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
bus_size_t, struct proc *, int);
- int (*_dmamap_load_mbuf) (bus_dma_tag_t, bus_dmamap_t,
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
struct mbuf *, int);
- int (*_dmamap_load_uio) (bus_dma_tag_t, bus_dmamap_t,
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
struct uio *, int);
- int (*_dmamap_load_raw) (bus_dma_tag_t, bus_dmamap_t,
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
bus_dma_segment_t *, int, bus_size_t, int);
- void (*_dmamap_unload) (bus_dma_tag_t, bus_dmamap_t);
- void (*_dmamap_sync) (bus_dma_tag_t, bus_dmamap_t,
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) (bus_dma_tag_t, bus_size_t, bus_size_t,
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
bus_size_t, bus_dma_segment_t *, int, int *, int);
- void (*_dmamem_free) (bus_dma_tag_t,
+ void (*_dmamem_free)(bus_dma_tag_t,
bus_dma_segment_t *, int);
- int (*_dmamem_map) (bus_dma_tag_t, bus_dma_segment_t *,
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
int, size_t, caddr_t *, int);
- void (*_dmamem_unmap) (bus_dma_tag_t, caddr_t, size_t);
- paddr_t (*_dmamem_mmap) (bus_dma_tag_t, bus_dma_segment_t *,
+ void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
int, off_t, int, int);
};
@@ -797,34 +797,34 @@ struct arm32_bus_dmamap {
int arm32_dma_range_intersect(struct arm32_dma_range *, int,
paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
-int _bus_dmamap_create (bus_dma_tag_t, bus_size_t, int, bus_size_t,
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
bus_size_t, int, bus_dmamap_t *);
-void _bus_dmamap_destroy (bus_dma_tag_t, bus_dmamap_t);
-int _bus_dmamap_load (bus_dma_tag_t, bus_dmamap_t, void *,
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
bus_size_t, struct proc *, int);
-int _bus_dmamap_load_mbuf (bus_dma_tag_t, bus_dmamap_t,
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
struct mbuf *, int);
-int _bus_dmamap_load_uio (bus_dma_tag_t, bus_dmamap_t,
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
struct uio *, int);
-int _bus_dmamap_load_raw (bus_dma_tag_t, bus_dmamap_t,
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
bus_dma_segment_t *, int, bus_size_t, int);
-void _bus_dmamap_unload (bus_dma_tag_t, bus_dmamap_t);
-void _bus_dmamap_sync (bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
bus_size_t, int);
-int _bus_dmamem_alloc (bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
-void _bus_dmamem_free (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs);
-int _bus_dmamem_map (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs, size_t size, caddr_t *kvap, int flags);
-void _bus_dmamem_unmap (bus_dma_tag_t tag, caddr_t kva,
+void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
size_t size);
-paddr_t _bus_dmamem_mmap (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs, off_t off, int prot, int flags);
-int _bus_dmamem_alloc_range (bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
vaddr_t low, vaddr_t high);
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index 312c2f6c9c9..a5547e68f42 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -289,16 +289,16 @@ int cpu_alloc_idle_pcb(struct cpu_info *);
/* cpuswitch.S */
struct pcb;
-void savectx (struct pcb *pcb);
+void savectx(struct pcb *pcb);
/* machdep.h */
-void bootsync (int);
+void bootsync(int);
/* fault.c */
-int badaddr_read (void *, size_t, void *);
+int badaddr_read(void *, size_t, void *);
/* syscall.c */
-void swi_handler (trapframe_t *);
+void swi_handler(trapframe_t *);
/* machine_machdep.c */
void board_startup(void);
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index 65da821b49a..c836ae9f2d1 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -52,28 +52,28 @@ struct cpu_functions {
/* CPU functions */
- u_int (*cf_id) (void);
- void (*cf_cpwait) (void);
+ u_int (*cf_id)(void);
+ void (*cf_cpwait)(void);
/* MMU functions */
- u_int (*cf_control) (u_int clear, u_int set);
- u_int (*cf_auxcontrol) (u_int clear, u_int set);
- void (*cf_domains) (u_int domains);
- void (*cf_setttb) (u_int ttb);
- u_int (*cf_dfsr) (void);
- u_int (*cf_dfar) (void);
- u_int (*cf_ifsr) (void);
- u_int (*cf_ifar) (void);
+ u_int (*cf_control)(u_int clear, u_int set);
+ u_int (*cf_auxcontrol)(u_int clear, u_int set);
+ void (*cf_domains)(u_int domains);
+ void (*cf_setttb)(u_int ttb);
+ u_int (*cf_dfsr)(void);
+ u_int (*cf_dfar)(void);
+ u_int (*cf_ifsr)(void);
+ u_int (*cf_ifar)(void);
/* TLB functions */
- void (*cf_tlb_flushID) (void);
- void (*cf_tlb_flushID_SE) (u_int va);
- void (*cf_tlb_flushI) (void);
- void (*cf_tlb_flushI_SE) (u_int va);
- void (*cf_tlb_flushD) (void);
- void (*cf_tlb_flushD_SE) (u_int va);
+ void (*cf_tlb_flushID)(void);
+ void (*cf_tlb_flushID_SE)(u_int va);
+ void (*cf_tlb_flushI)(void);
+ void (*cf_tlb_flushI_SE)(u_int va);
+ void (*cf_tlb_flushD)(void);
+ void (*cf_tlb_flushD_SE)(u_int va);
/*
* Cache operations:
@@ -125,33 +125,33 @@ struct cpu_functions {
* Valid virtual addresses must be passed to each
* cache operation.
*/
- void (*cf_icache_sync_all) (void);
- void (*cf_icache_sync_range) (vaddr_t, vsize_t);
+ void (*cf_icache_sync_all)(void);
+ void (*cf_icache_sync_range)(vaddr_t, vsize_t);
- void (*cf_dcache_wbinv_all) (void);
- void (*cf_dcache_wbinv_range) (vaddr_t, vsize_t);
- void (*cf_dcache_inv_range) (vaddr_t, vsize_t);
- void (*cf_dcache_wb_range) (vaddr_t, vsize_t);
+ void (*cf_dcache_wbinv_all)(void);
+ void (*cf_dcache_wbinv_range)(vaddr_t, vsize_t);
+ void (*cf_dcache_inv_range)(vaddr_t, vsize_t);
+ void (*cf_dcache_wb_range)(vaddr_t, vsize_t);
- void (*cf_idcache_wbinv_all) (void);
- void (*cf_idcache_wbinv_range) (vaddr_t, vsize_t);
+ void (*cf_idcache_wbinv_all)(void);
+ void (*cf_idcache_wbinv_range)(vaddr_t, vsize_t);
- void (*cf_sdcache_wbinv_all) (void);
- void (*cf_sdcache_wbinv_range) (vaddr_t, paddr_t, vsize_t);
- void (*cf_sdcache_inv_range) (vaddr_t, paddr_t, vsize_t);
- void (*cf_sdcache_wb_range) (vaddr_t, paddr_t, vsize_t);
- void (*cf_sdcache_drain_writebuf) (void);
+ void (*cf_sdcache_wbinv_all)(void);
+ void (*cf_sdcache_wbinv_range)(vaddr_t, paddr_t, vsize_t);
+ void (*cf_sdcache_inv_range)(vaddr_t, paddr_t, vsize_t);
+ void (*cf_sdcache_wb_range)(vaddr_t, paddr_t, vsize_t);
+ void (*cf_sdcache_drain_writebuf)(void);
/* Other functions */
- void (*cf_flush_prefetchbuf) (void);
- void (*cf_drain_writebuf) (void);
+ void (*cf_flush_prefetchbuf)(void);
+ void (*cf_drain_writebuf)(void);
- void (*cf_sleep) (int mode);
+ void (*cf_sleep)(int mode);
/* Soft functions */
- void (*cf_context_switch) (u_int);
- void (*cf_setup) (void);
+ void (*cf_context_switch)(u_int);
+ void (*cf_setup)(void);
};
extern struct cpu_functions cpufuncs;
@@ -202,50 +202,50 @@ extern u_int cputype;
#define cpu_context_switch(a) cpufuncs.cf_context_switch(a)
#define cpu_setup(a) cpufuncs.cf_setup(a)
-int set_cpufuncs (void);
+int set_cpufuncs(void);
#define ARCHITECTURE_NOT_PRESENT 1 /* known but not configured */
#define ARCHITECTURE_NOT_SUPPORTED 2 /* not known */
-void cpufunc_nullop (void);
-int early_abort_fixup (void *);
-int late_abort_fixup (void *);
-u_int cpufunc_id (void);
-u_int cpufunc_control (u_int clear, u_int set);
-u_int cpufunc_auxcontrol (u_int clear, u_int set);
-void cpufunc_domains (u_int domains);
-u_int cpufunc_dfsr (void);
-u_int cpufunc_dfar (void);
-u_int cpufunc_ifsr (void);
-u_int cpufunc_ifar (void);
+void cpufunc_nullop(void);
+int early_abort_fixup(void *);
+int late_abort_fixup(void *);
+u_int cpufunc_id(void);
+u_int cpufunc_control(u_int clear, u_int set);
+u_int cpufunc_auxcontrol(u_int clear, u_int set);
+void cpufunc_domains(u_int domains);
+u_int cpufunc_dfsr(void);
+u_int cpufunc_dfar(void);
+u_int cpufunc_ifsr(void);
+u_int cpufunc_ifar(void);
-void armv7_setttb (u_int);
+void armv7_setttb(u_int);
-void armv7_tlb_flushID_SE (u_int);
-void armv7_tlb_flushI_SE (u_int);
+void armv7_tlb_flushID_SE(u_int);
+void armv7_tlb_flushI_SE(u_int);
-void armv7_context_switch (u_int);
+void armv7_context_switch(u_int);
-void armv7_setup (void);
-void armv7_tlb_flushID (void);
-void armv7_tlb_flushI (void);
-void armv7_tlb_flushD (void);
-void armv7_tlb_flushD_SE (u_int va);
+void armv7_setup(void);
+void armv7_tlb_flushID(void);
+void armv7_tlb_flushI(void);
+void armv7_tlb_flushD(void);
+void armv7_tlb_flushD_SE(u_int va);
-void armv7_drain_writebuf (void);
-void armv7_cpu_sleep (int mode);
+void armv7_drain_writebuf(void);
+void armv7_cpu_sleep(int mode);
-u_int armv7_periphbase (void);
+u_int armv7_periphbase(void);
-void armv7_icache_sync_all (void);
-void armv7_icache_sync_range (vaddr_t, vsize_t);
+void armv7_icache_sync_all(void);
+void armv7_icache_sync_range(vaddr_t, vsize_t);
-void armv7_dcache_wbinv_all (void);
-void armv7_dcache_wbinv_range (vaddr_t, vsize_t);
-void armv7_dcache_inv_range (vaddr_t, vsize_t);
-void armv7_dcache_wb_range (vaddr_t, vsize_t);
+void armv7_dcache_wbinv_all(void);
+void armv7_dcache_wbinv_range(vaddr_t, vsize_t);
+void armv7_dcache_inv_range(vaddr_t, vsize_t);
+void armv7_dcache_wb_range(vaddr_t, vsize_t);
-void armv7_idcache_wbinv_all (void);
-void armv7_idcache_wbinv_range (vaddr_t, vsize_t);
+void armv7_idcache_wbinv_all(void);
+void armv7_idcache_wbinv_range(vaddr_t, vsize_t);
extern unsigned armv7_dcache_sets_max;
extern unsigned armv7_dcache_sets_inc;
@@ -304,20 +304,20 @@ __get_cpsr()
* (in arm/arm/setstack.S)
*/
-void set_stackptr (u_int mode, u_int address);
-u_int get_stackptr (u_int mode);
+void set_stackptr(u_int mode, u_int address);
+u_int get_stackptr(u_int mode);
/*
* Miscellany
*/
-int get_pc_str_offset (void);
+int get_pc_str_offset(void);
/*
* CPU functions from locore.S
*/
-void cpu_reset (void) __attribute__((__noreturn__));
+void cpu_reset(void) __attribute__((__noreturn__));
/*
* Cache info variables.
diff --git a/sys/arch/arm/include/db_machdep.h
b/sys/arch/arm/include/db_machdep.h
index 381eaf80061..be6b3881bf6 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -94,8 +94,8 @@ extern db_regs_t ddb_regs; /* register
state */
#define SOFTWARE_SSTEP
db_addr_t db_branch_taken(u_int inst, db_addr_t pc, db_regs_t *regs);
-int db_ktrap (int, db_regs_t *);
-void db_machine_init (void);
+int db_ktrap(int, db_regs_t *);
+void db_machine_init(void);
#define branch_taken(ins, pc, fun, regs) \
db_branch_taken((ins), (pc), (regs))
diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h
index d5f06623e05..b75c1f4a141 100644
--- a/sys/arch/arm/include/machdep.h
+++ b/sys/arch/arm/include/machdep.h
@@ -5,23 +5,23 @@
#define _ARM_MACHDEP_H_
/* misc prototypes used by the many arm machdeps */
-void halt (void);
-void parse_mi_bootargs (char *);
-void data_abort_handler (trapframe_t *);
-void prefetch_abort_handler (trapframe_t *);
-void undefinedinstruction_bounce (trapframe_t *);
-void dumpsys (void);
+void halt(void);
+void parse_mi_bootargs(char *);
+void data_abort_handler(trapframe_t *);
+void prefetch_abort_handler(trapframe_t *);
+void undefinedinstruction_bounce(trapframe_t *);
+void dumpsys(void);
/*
* note that we use void * as all the platforms have different ideas on what
* the structure is
*/
-u_int initarm (void *, void *, void *, paddr_t);
+u_int initarm(void *, void *, void *, paddr_t);
/* from arm/arm/intr.c */
-void dosoftints (void);
-void set_spl_masks (void);
+void dosoftints(void);
+void set_spl_masks(void);
#ifdef DIAGNOSTIC
-void dump_spl_masks (void);
+void dump_spl_masks(void);
#endif
#endif
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h
index d61eaf6a9ac..4c7d8db69be 100644
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -95,7 +95,7 @@
#define USPACE_UNDEF_STACK_BOTTOM (sizeof(struct user) +
FPCONTEXTSIZE + 10)
#ifndef _LOCORE
-void delay (unsigned);
+void delay(unsigned);
#define DELAY(x) delay(x)
#endif
diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h
index 946db39ab29..77ff7265f26 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -53,9 +53,9 @@ struct arm_sync_icache_args {
#include <sys/cdefs.h>
__BEGIN_DECLS
-int arm_sync_icache (u_int addr, int len);
-int arm_drain_writebuf (void);
-int sysarch (int, void *);
+int arm_sync_icache(u_int addr, int len);
+int arm_drain_writebuf(void);
+int sysarch(int, void *);
__END_DECLS
#endif
diff --git a/sys/arch/arm/include/undefined.h b/sys/arch/arm/include/undefined.h
index e3c38ca7e2e..d51144400b8 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -51,7 +51,7 @@
#include <sys/queue.h>
-typedef int (*undef_handler_t) (unsigned int, unsigned int, trapframe_t *,
int);
+typedef int (*undef_handler_t)(unsigned int, unsigned int, trapframe_t *, int);
#define FP_COPROC 1
#define FP_COPROC2 2
@@ -59,9 +59,9 @@ typedef int (*undef_handler_t) (unsigned int, unsigned int,
trapframe_t *, int);
/* Prototypes for undefined.c */
-void *install_coproc_handler (int, undef_handler_t);
-void remove_coproc_handler (void *);
-void undefined_init (void);
+void *install_coproc_handler(int, undef_handler_t);
+void remove_coproc_handler(void *);
+void undefined_init(void);
/*
* XXX Stuff below here is for use before malloc() is available. Most code
@@ -77,7 +77,7 @@ struct undefined_handler {
* Handlers installed using install_coproc_handler_static shouldn't be
* removed.
*/
-void install_coproc_handler_static (int, struct undefined_handler *);
+void install_coproc_handler_static(int, struct undefined_handler *);
/* Calls up to undefined.c from trap handlers */
void undefinedinstruction(struct trapframe *);