summaryrefslogtreecommitdiff
path: root/sys/arch/arm/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm/include')
-rw-r--r--sys/arch/arm/include/arm32/db_machdep.h6
-rw-r--r--sys/arch/arm/include/arm32/machdep.h22
-rw-r--r--sys/arch/arm/include/arm32/param.h4
-rw-r--r--sys/arch/arm/include/arm32/rtc.h6
-rw-r--r--sys/arch/arm/include/bootconfig.h4
-rw-r--r--sys/arch/arm/include/bus.h552
-rw-r--r--sys/arch/arm/include/db_machdep.h8
-rw-r--r--sys/arch/arm/include/disklabel.h10
-rw-r--r--sys/arch/arm/include/ofw.h28
-rw-r--r--sys/arch/arm/include/sysarch.h8
-rw-r--r--sys/arch/arm/include/undefined.h12
11 files changed, 330 insertions, 330 deletions
diff --git a/sys/arch/arm/include/arm32/db_machdep.h b/sys/arch/arm/include/arm32/db_machdep.h
index eaebecbbb1e..2f501c3e32d 100644
--- a/sys/arch/arm/include/arm32/db_machdep.h
+++ b/sys/arch/arm/include/arm32/db_machdep.h
@@ -1,11 +1,11 @@
-/* $NetBSD: db_machdep.h,v 1.4 2007/02/22 04:38:03 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
#ifndef _ARM32_DB_MACHDEP_H_
#define _ARM32_DB_MACHDEP_H_
#include <arm/db_machdep.h>
-void db_show_panic_cmd __P((db_expr_t, bool, db_expr_t, const char *));
-void db_show_frame_cmd __P((db_expr_t, bool, db_expr_t, const char *));
+void db_show_panic_cmd(db_expr_t, bool, db_expr_t, const char *);
+void db_show_frame_cmd(db_expr_t, bool, db_expr_t, const char *);
#endif
diff --git a/sys/arch/arm/include/arm32/machdep.h b/sys/arch/arm/include/arm32/machdep.h
index 5ca0c3bb00d..3f16b9fee8c 100644
--- a/sys/arch/arm/include/arm32/machdep.h
+++ b/sys/arch/arm/include/arm32/machdep.h
@@ -1,26 +1,26 @@
-/* $NetBSD: machdep.h,v 1.8 2007/03/04 05:59:38 christos Exp $ */
+/* $NetBSD: machdep.h,v 1.9 2009/03/14 14:45:55 dsl Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
/* misc prototypes used by the many arm machdeps */
-void halt __P((void));
-void parse_mi_bootargs __P((char *));
-void data_abort_handler __P((trapframe_t *));
-void prefetch_abort_handler __P((trapframe_t *));
-void undefinedinstruction_bounce __P((trapframe_t *));
-void dumpsys __P((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 __P((void *));
+u_int initarm(void *);
/* from arm/arm32/intr.c */
-void dosoftints __P((void));
-void set_spl_masks __P((void));
+void dosoftints(void);
+void set_spl_masks(void);
#ifdef DIAGNOSTIC
-void dump_spl_masks __P((void));
+void dump_spl_masks(void);
#endif
#endif
diff --git a/sys/arch/arm/include/arm32/param.h b/sys/arch/arm/include/arm32/param.h
index 8b112637d36..11615c0681c 100644
--- a/sys/arch/arm/include/arm32/param.h
+++ b/sys/arch/arm/include/arm32/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.13 2008/01/19 15:04:10 chris Exp $ */
+/* $NetBSD: param.h,v 1.14 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -112,7 +112,7 @@
#ifdef _KERNEL
#ifndef _LOCORE
-void delay __P((unsigned));
+void delay(unsigned);
#define DELAY(x) delay(x)
#endif
#endif
diff --git a/sys/arch/arm/include/arm32/rtc.h b/sys/arch/arm/include/arm32/rtc.h
index bd0f7977f36..87c97aaced8 100644
--- a/sys/arch/arm/include/arm32/rtc.h
+++ b/sys/arch/arm/include/arm32/rtc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $ */
+/* $NetBSD: rtc.h,v 1.2 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -76,8 +76,8 @@ typedef struct {
#define RTC_ADDR_CENT 0xc1
#ifdef _KERNEL
-int cmos_read __P((int));
-int cmos_write __P((int, int));
+int cmos_read(int);
+int cmos_write(int, int);
#endif /* _KERNEL */
/* End of rtc.h */
diff --git a/sys/arch/arm/include/bootconfig.h b/sys/arch/arm/include/bootconfig.h
index 80d162323f0..e92acad107e 100644
--- a/sys/arch/arm/include/bootconfig.h
+++ b/sys/arch/arm/include/bootconfig.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.h,v 1.4 2006/10/26 23:31:47 bjh21 Exp $ */
+/* $NetBSD: bootconfig.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -44,7 +44,7 @@
#define BOOTOPT_TYPE_HEXINT 4
#define BOOTOPT_TYPE_MASK 7
-int get_bootconf_option __P((char *, const char *, int, void *));
+int get_bootconf_option(char *, const char *, int, void *);
extern char *boot_args;
#endif /* _KERNEL */
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 400a250e588..1461f5d687d 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.19 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: bus.h,v 1.20 2009/03/14 14:45:55 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -81,8 +81,8 @@ typedef struct bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
/*
- * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* Map a region of bus space.
*/
@@ -96,180 +96,180 @@ struct bus_space {
void *bs_cookie;
/* mapping/unmapping */
- int (*bs_map) __P((void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *));
- void (*bs_unmap) __P((void *, bus_space_handle_t,
- bus_size_t));
- int (*bs_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
+ int (*bs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
+ void (*bs_unmap)(void *, bus_space_handle_t,
+ bus_size_t);
+ int (*bs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
/* allocation/deallocation */
- int (*bs_alloc) __P((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) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_addr_t *, bus_space_handle_t *);
+ void (*bs_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
- void * (*bs_vaddr) __P((void *, bus_space_handle_t));
+ void * (*bs_vaddr)(void *, bus_space_handle_t);
/* mmap bus space for user */
- paddr_t (*bs_mmap) __P((void *, bus_addr_t, off_t, int, int));
+ paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
- void (*bs_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+ void (*bs_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
- u_int8_t (*bs_r_1) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int16_t (*bs_r_2) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int32_t (*bs_r_4) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int64_t (*bs_r_8) __P((void *, bus_space_handle_t,
- bus_size_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,
+ bus_size_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,
+ bus_size_t);
/* read multiple */
- void (*bs_rm_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rm_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rm_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rm_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_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,
+ bus_size_t, u_int16_t *, bus_size_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,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
- void (*bs_rr_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rr_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rr_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rr_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_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,
+ bus_size_t, u_int16_t *, bus_size_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,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
- void (*bs_w_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
- void (*bs_w_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
- void (*bs_w_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
- void (*bs_w_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_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,
+ bus_size_t, u_int16_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,
+ bus_size_t, u_int64_t);
/* write multiple */
- void (*bs_wm_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wm_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wm_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wm_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_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,
+ bus_size_t, const u_int16_t *, bus_size_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,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
- void (*bs_wr_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wr_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wr_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wr_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_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,
+ bus_size_t, const u_int16_t *, bus_size_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,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
- void (*bs_sm_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
- void (*bs_sm_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
- void (*bs_sm_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
- void (*bs_sm_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_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,
+ bus_size_t, u_int16_t, bus_size_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,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
- void (*bs_sr_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
- void (*bs_sr_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
- void (*bs_sr_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
- void (*bs_sr_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_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,
+ bus_size_t, u_int16_t, bus_size_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,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
- void (*bs_c_1) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_2) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_4) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_8) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_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,
+ bus_space_handle_t, bus_size_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,
+ bus_space_handle_t, bus_size_t, bus_size_t);
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
/* read stream (single) */
- u_int8_t (*bs_r_1_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int16_t (*bs_r_2_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int32_t (*bs_r_4_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int64_t (*bs_r_8_s) __P((void *, bus_space_handle_t,
- bus_size_t));
+ u_int8_t (*bs_r_1_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int16_t (*bs_r_2_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int32_t (*bs_r_4_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int64_t (*bs_r_8_s)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple stream */
- void (*bs_rm_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rm_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rm_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rm_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rm_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rm_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rm_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rm_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region stream */
- void (*bs_rr_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rr_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rr_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rr_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rr_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rr_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rr_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rr_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write stream (single) */
- void (*bs_w_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
- void (*bs_w_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
- void (*bs_w_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
- void (*bs_w_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+ void (*bs_w_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+ void (*bs_w_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+ void (*bs_w_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+ void (*bs_w_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple stream */
- void (*bs_wm_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wm_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wm_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wm_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wm_1_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wm_2_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wm_4_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wm_8_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region stream */
- void (*bs_wr_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wr_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wr_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wr_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wr_1_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wr_2_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wr_4_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wr_8_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
#endif /* __BUS_SPACE_HAS_STREAM_METHODS */
};
@@ -510,185 +510,185 @@ struct bus_space {
*/
#define bs_map_proto(f) \
-int __bs_c(f,_bs_map) __P((void *t, bus_addr_t addr, \
- bus_size_t size, int cacheable, bus_space_handle_t *bshp));
+int __bs_c(f,_bs_map)(void *t, bus_addr_t addr, \
+ bus_size_t size, int cacheable, bus_space_handle_t *bshp);
#define bs_unmap_proto(f) \
-void __bs_c(f,_bs_unmap) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t size));
+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) __P((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));
+ bus_space_handle_t *nbshp);
#define bs_alloc_proto(f) \
-int __bs_c(f,_bs_alloc) __P((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 cacheable, bus_addr_t *addrp, \
- bus_space_handle_t *bshp));
+ bus_space_handle_t *bshp);
#define bs_free_proto(f) \
-void __bs_c(f,_bs_free) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t size));
+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) __P((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) __P((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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, bus_size_t len, int flags));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value, bus_size_t count));
+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) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value, bus_size_t count));
+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) __P((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));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_2_proto(f) \
-void __bs_c(f,_bs_c_2) __P((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));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_4_proto(f) \
-void __bs_c(f,_bs_c_4) __P((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));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_8_proto(f) \
-void __bs_c(f,_bs_c_8) __P((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));
+ bus_size_t offset2, bus_size_t count);
#define bs_protos(f) \
bs_map_proto(f); \
@@ -829,35 +829,35 @@ struct arm32_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync_pre) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
- void (*_dmamap_sync_post) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_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 *,
+ bus_size_t, struct proc *, int);
+ 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,
+ struct uio *, int);
+ 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_pre)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+ void (*_dmamap_sync_post)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, void *, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ 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,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -940,37 +940,37 @@ 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 __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
-void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-
-int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+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 *,
+ bus_size_t, struct proc *, int);
+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,
+ struct uio *, int);
+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,
+ bus_size_t, int);
+
+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 __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs));
-int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, void *kva,
- size_t size));
-paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags));
-
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ 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,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, void **kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
+ size_t size);
+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,
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));
+ vaddr_t low, vaddr_t high);
#endif /* _ARM32_BUS_DMA_PRIVATE */
#endif /* _ARM32_BUS_H_ */
diff --git a/sys/arch/arm/include/db_machdep.h b/sys/arch/arm/include/db_machdep.h
index 441e6841e62..c6b4729302d 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.15 2008/08/29 19:08:29 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.16 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -108,9 +108,9 @@ extern db_regs_t ddb_regs; /* register state */
#define SOFTWARE_SSTEP
-u_int branch_taken __P((u_int insn, u_int pc, db_regs_t *db_regs));
-int kdb_trap __P((int, db_regs_t *));
-void db_machine_init __P((void));
+u_int branch_taken(u_int insn, u_int pc, db_regs_t *db_regs);
+int kdb_trap(int, db_regs_t *);
+void db_machine_init(void);
int db_validate_address(vm_offset_t addr);
#define DB_ELF_SYMBOLS
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h
index 518e397b560..0a2192ca85d 100644
--- a/sys/arch/arm/include/disklabel.h
+++ b/sys/arch/arm/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2005/12/11 12:16:46 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -71,12 +71,12 @@ struct buf;
struct disklabel;
/* for readdisklabel. rv != 0 -> matches, msg == NULL -> success */
-int mbr_label_read __P((dev_t, void (*)(struct buf *), struct disklabel *,
- struct cpu_disklabel *, const char **, int *, int *));
+int mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
+ struct cpu_disklabel *, const char **, int *, int *);
/* for writedisklabel. rv == 0 -> dosen't match, rv > 0 -> success */
-int mbr_label_locate __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *, int *, int *));
+int mbr_label_locate(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *, int *, int *);
#endif /* _KERNEL */
#endif /* _ARM_DISKLABEL_H_ */
diff --git a/sys/arch/arm/include/ofw.h b/sys/arch/arm/include/ofw.h
index dc3288593aa..c41f4ffafde 100644
--- a/sys/arch/arm/include/ofw.h
+++ b/sys/arch/arm/include/ofw.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.h,v 1.2 2006/10/26 22:49:36 bjh21 Exp $ */
+/* $NetBSD: ofw.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright 1997
@@ -48,23 +48,23 @@ typedef int (*ofw_handle_t)(void *);
/* Implemented in <ofw/ofw.c> */
-void ofw_init __P((ofw_handle_t));
-void ofw_boot __P((int, char *));
-void ofw_getbootinfo __P((char **, char **));
-void ofw_configmem __P((void));
-void ofw_configisa __P((vm_offset_t *, vm_offset_t *));
-void ofw_configisadma __P((vm_offset_t *));
-int ofw_isadmarangeintersect __P((vm_offset_t, vm_offset_t,
- vm_offset_t *, vm_offset_t *));
-vm_offset_t ofw_gettranslation __P((vm_offset_t));
-vm_offset_t ofw_map __P((vm_offset_t, vm_size_t, int));
-vm_offset_t ofw_getcleaninfo __P((void));
+void ofw_init(ofw_handle_t);
+void ofw_boot(int, char *);
+void ofw_getbootinfo(char **, char **);
+void ofw_configmem(void);
+void ofw_configisa(vm_offset_t *, vm_offset_t *);
+void ofw_configisadma(vm_offset_t *);
+int ofw_isadmarangeintersect(vm_offset_t, vm_offset_t,
+ vm_offset_t *, vm_offset_t *);
+vm_offset_t ofw_gettranslation(vm_offset_t);
+vm_offset_t ofw_map(vm_offset_t, vm_size_t, int);
+vm_offset_t ofw_getcleaninfo(void);
#ifdef OFWGENCFG
/* Implemented in <ofw/ofwgencfg_machdep.c> */
extern int ofw_handleticks;
-extern void cpu_reboot __P((int, char *));
-extern void ofrootfound __P((void));
+extern void cpu_reboot(int, char *);
+extern void ofrootfound(void);
#endif
#endif /* !_MACHINE_OFW_H_ */
diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h
index 28d41f61d16..0f4b0c44196 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.6 2005/12/11 12:16:47 christos Exp $ */
+/* $NetBSD: sysarch.h,v 1.7 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@@ -56,9 +56,9 @@ struct arm_sync_icache_args {
#ifndef _KERNEL
__BEGIN_DECLS
-int arm_sync_icache __P((u_int addr, int len));
-int arm_drain_writebuf __P((void));
-int sysarch __P((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 b0770ad9742..17a4eb32102 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.h,v 1.11 2008/03/15 10:16:43 rearnsha Exp $ */
+/* $NetBSD: undefined.h,v 1.12 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1995-1996 Mark Brinicombe.
@@ -50,7 +50,7 @@
#include <sys/queue.h>
-typedef int (*undef_handler_t) __P((unsigned int, unsigned int, trapframe_t *, int));
+typedef int (*undef_handler_t)(unsigned int, unsigned int, trapframe_t *, int);
/*
* Enumeration of coprocessor numbers. Values may be duplicated
@@ -77,9 +77,9 @@ enum arm_coprocs {
/* Prototypes for undefined.c */
-void *install_coproc_handler __P((int, undef_handler_t));
-void remove_coproc_handler __P((void *));
-void undefined_init __P((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
@@ -95,7 +95,7 @@ struct undefined_handler {
* Handlers installed using install_coproc_handler_static shouldn't be
* removed.
*/
-void install_coproc_handler_static __P((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 *);