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/bus.h546
-rw-r--r--sys/arch/arm/include/cpu.h18
-rw-r--r--sys/arch/arm/include/cpufunc.h340
-rw-r--r--sys/arch/arm/include/db_machdep.h10
-rw-r--r--sys/arch/arm/include/disklabel.h12
-rw-r--r--sys/arch/arm/include/float.h4
-rw-r--r--sys/arch/arm/include/frame.h4
-rw-r--r--sys/arch/arm/include/machdep.h22
-rw-r--r--sys/arch/arm/include/param.h4
-rw-r--r--sys/arch/arm/include/rtc.h6
-rw-r--r--sys/arch/arm/include/sysarch.h8
-rw-r--r--sys/arch/arm/include/undefined.h12
12 files changed, 493 insertions, 493 deletions
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index b1a508e9903..e33828a136c 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -88,8 +88,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.
*/
@@ -103,180 +103,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 */
};
@@ -529,185 +529,185 @@ bus_space_copy_4(bus_space_tag_t bst, bus_space_handle_t h1,
*/
#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); \
@@ -853,33 +853,33 @@ 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) __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) (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, caddr_t *, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, 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, 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 *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -952,37 +952,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, caddr_t *kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t 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, caddr_t *kvap, int flags);
+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,
+ 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 */
/* These are OpenBSD extensions to the general NetBSD bus interface. */
#if 0
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index d552d6ec4c4..9d5bb9d675b 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.3 2004/02/26 04:58:38 drahn Exp $ */
+/* $OpenBSD: cpu.h,v 1.4 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $ */
/*
@@ -266,8 +266,8 @@ extern int want_resched; /* resched() was called */
*/
struct device;
-void cpu_attach __P((struct device *));
-int cpu_alloc_idlepcb __P((struct cpu_info *));
+void cpu_attach (struct device *);
+int cpu_alloc_idlepcb (struct cpu_info *);
#endif
@@ -276,24 +276,24 @@ int cpu_alloc_idlepcb __P((struct cpu_info *));
*/
/* locore.S */
-void atomic_set_bit __P((u_int *address, u_int setmask));
-void atomic_clear_bit __P((u_int *address, u_int clearmask));
+void atomic_set_bit (u_int *address, u_int setmask);
+void atomic_clear_bit (u_int *address, u_int clearmask);
/* cpuswitch.S */
struct pcb;
-void savectx __P((struct pcb *pcb));
+void savectx (struct pcb *pcb);
/* ast.c */
void userret (register struct proc *p, u_int32_t pc, quad_t ticks);
/* machdep.h */
-void bootsync __P((void));
+void bootsync (void);
/* fault.c */
-int badaddr_read __P((void *, size_t, void *));
+int badaddr_read (void *, size_t, void *);
/* syscall.c */
-void swi_handler __P((trapframe_t *));
+void swi_handler (trapframe_t *);
#endif /* !_LOCORE */
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index f732dfe03c2..079d88fb379 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: cpufunc.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */
/*
@@ -52,25 +52,25 @@ struct cpu_functions {
/* CPU functions */
- u_int (*cf_id) __P((void));
- void (*cf_cpwait) __P((void));
+ u_int (*cf_id) (void);
+ void (*cf_cpwait) (void);
/* MMU functions */
- u_int (*cf_control) __P((u_int bic, u_int eor));
- void (*cf_domains) __P((u_int domains));
- void (*cf_setttb) __P((u_int ttb));
- u_int (*cf_faultstatus) __P((void));
- u_int (*cf_faultaddress) __P((void));
+ u_int (*cf_control) (u_int bic, u_int eor);
+ void (*cf_domains) (u_int domains);
+ void (*cf_setttb) (u_int ttb);
+ u_int (*cf_faultstatus) (void);
+ u_int (*cf_faultaddress) (void);
/* TLB functions */
- void (*cf_tlb_flushID) __P((void));
- void (*cf_tlb_flushID_SE) __P((u_int va));
- void (*cf_tlb_flushI) __P((void));
- void (*cf_tlb_flushI_SE) __P((u_int va));
- void (*cf_tlb_flushD) __P((void));
- void (*cf_tlb_flushD_SE) __P((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:
@@ -122,34 +122,34 @@ struct cpu_functions {
* Valid virtual addresses must be passed to each
* cache operation.
*/
- void (*cf_icache_sync_all) __P((void));
- void (*cf_icache_sync_range) __P((vaddr_t, vsize_t));
+ void (*cf_icache_sync_all) (void);
+ void (*cf_icache_sync_range) (vaddr_t, vsize_t);
- void (*cf_dcache_wbinv_all) __P((void));
- void (*cf_dcache_wbinv_range) __P((vaddr_t, vsize_t));
- void (*cf_dcache_inv_range) __P((vaddr_t, vsize_t));
- void (*cf_dcache_wb_range) __P((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) __P((void));
- void (*cf_idcache_wbinv_range) __P((vaddr_t, vsize_t));
+ void (*cf_idcache_wbinv_all) (void);
+ void (*cf_idcache_wbinv_range) (vaddr_t, vsize_t);
/* Other functions */
- void (*cf_flush_prefetchbuf) __P((void));
- void (*cf_drain_writebuf) __P((void));
- void (*cf_flush_brnchtgt_C) __P((void));
- void (*cf_flush_brnchtgt_E) __P((u_int va));
+ void (*cf_flush_prefetchbuf) (void);
+ void (*cf_drain_writebuf) (void);
+ void (*cf_flush_brnchtgt_C) (void);
+ void (*cf_flush_brnchtgt_E) (u_int va);
- void (*cf_sleep) __P((int mode));
+ void (*cf_sleep) (int mode);
/* Soft functions */
- int (*cf_dataabt_fixup) __P((void *arg));
- int (*cf_prefetchabt_fixup) __P((void *arg));
+ int (*cf_dataabt_fixup) (void *arg);
+ int (*cf_prefetchabt_fixup) (void *arg);
- void (*cf_context_switch) __P((void));
+ void (*cf_context_switch) (void);
- void (*cf_setup) __P((char *string));
+ void (*cf_setup) (char *string);
};
extern struct cpu_functions cpufuncs;
@@ -197,162 +197,162 @@ extern u_int cputype;
#define cpu_setup(a) cpufuncs.cf_setup(a)
-int set_cpufuncs __P((void));
+int set_cpufuncs (void);
#define ARCHITECTURE_NOT_PRESENT 1 /* known but not configured */
#define ARCHITECTURE_NOT_SUPPORTED 2 /* not known */
-void cpufunc_nullop __P((void));
-int cpufunc_null_fixup __P((void *));
-int early_abort_fixup __P((void *));
-int late_abort_fixup __P((void *));
-u_int cpufunc_id __P((void));
-u_int cpufunc_control __P((u_int clear, u_int bic));
-void cpufunc_domains __P((u_int domains));
-u_int cpufunc_faultstatus __P((void));
-u_int cpufunc_faultaddress __P((void));
+void cpufunc_nullop (void);
+int cpufunc_null_fixup (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 bic);
+void cpufunc_domains (u_int domains);
+u_int cpufunc_faultstatus (void);
+u_int cpufunc_faultaddress (void);
#ifdef CPU_ARM3
-u_int arm3_control __P((u_int clear, u_int bic));
-void arm3_cache_flush __P((void));
+u_int arm3_control (u_int clear, u_int bic);
+void arm3_cache_flush (void);
#endif /* CPU_ARM3 */
#if defined(CPU_ARM6) || defined(CPU_ARM7)
-void arm67_setttb __P((u_int ttb));
-void arm67_tlb_flush __P((void));
-void arm67_tlb_purge __P((u_int va));
-void arm67_cache_flush __P((void));
-void arm67_context_switch __P((void));
+void arm67_setttb (u_int ttb);
+void arm67_tlb_flush (void);
+void arm67_tlb_purge (u_int va);
+void arm67_cache_flush (void);
+void arm67_context_switch (void);
#endif /* CPU_ARM6 || CPU_ARM7 */
#ifdef CPU_ARM6
-void arm6_setup __P((char *string));
+void arm6_setup (char *string);
#endif /* CPU_ARM6 */
#ifdef CPU_ARM7
-void arm7_setup __P((char *string));
+void arm7_setup (char *string);
#endif /* CPU_ARM7 */
#ifdef CPU_ARM7TDMI
-int arm7_dataabt_fixup __P((void *arg));
-void arm7tdmi_setup __P((char *string));
-void arm7tdmi_setttb __P((u_int ttb));
-void arm7tdmi_tlb_flushID __P((void));
-void arm7tdmi_tlb_flushID_SE __P((u_int va));
-void arm7tdmi_cache_flushID __P((void));
-void arm7tdmi_context_switch __P((void));
+int arm7_dataabt_fixup (void *arg);
+void arm7tdmi_setup (char *string);
+void arm7tdmi_setttb (u_int ttb);
+void arm7tdmi_tlb_flushID (void);
+void arm7tdmi_tlb_flushID_SE (u_int va);
+void arm7tdmi_cache_flushID (void);
+void arm7tdmi_context_switch (void);
#endif /* CPU_ARM7TDMI */
#ifdef CPU_ARM8
-void arm8_setttb __P((u_int ttb));
-void arm8_tlb_flushID __P((void));
-void arm8_tlb_flushID_SE __P((u_int va));
-void arm8_cache_flushID __P((void));
-void arm8_cache_flushID_E __P((u_int entry));
-void arm8_cache_cleanID __P((void));
-void arm8_cache_cleanID_E __P((u_int entry));
-void arm8_cache_purgeID __P((void));
-void arm8_cache_purgeID_E __P((u_int entry));
-
-void arm8_cache_syncI __P((void));
-void arm8_cache_cleanID_rng __P((vaddr_t start, vsize_t end));
-void arm8_cache_cleanD_rng __P((vaddr_t start, vsize_t end));
-void arm8_cache_purgeID_rng __P((vaddr_t start, vsize_t end));
-void arm8_cache_purgeD_rng __P((vaddr_t start, vsize_t end));
-void arm8_cache_syncI_rng __P((vaddr_t start, vsize_t end));
-
-void arm8_context_switch __P((void));
-
-void arm8_setup __P((char *string));
-
-u_int arm8_clock_config __P((u_int, u_int));
+void arm8_setttb (u_int ttb);
+void arm8_tlb_flushID (void);
+void arm8_tlb_flushID_SE (u_int va);
+void arm8_cache_flushID (void);
+void arm8_cache_flushID_E (u_int entry);
+void arm8_cache_cleanID (void);
+void arm8_cache_cleanID_E (u_int entry);
+void arm8_cache_purgeID (void);
+void arm8_cache_purgeID_E (u_int entry);
+
+void arm8_cache_syncI (void);
+void arm8_cache_cleanID_rng (vaddr_t start, vsize_t end);
+void arm8_cache_cleanD_rng (vaddr_t start, vsize_t end);
+void arm8_cache_purgeID_rng (vaddr_t start, vsize_t end);
+void arm8_cache_purgeD_rng (vaddr_t start, vsize_t end);
+void arm8_cache_syncI_rng (vaddr_t start, vsize_t end);
+
+void arm8_context_switch (void);
+
+void arm8_setup (char *string);
+
+u_int arm8_clock_config (u_int, u_int);
#endif
#ifdef CPU_SA110
-void sa110_setup __P((char *string));
-void sa110_context_switch __P((void));
+void sa110_setup (char *string);
+void sa110_context_switch (void);
#endif /* CPU_SA110 */
#if defined(CPU_SA1100) || defined(CPU_SA1110)
-void sa11x0_drain_readbuf __P((void));
+void sa11x0_drain_readbuf (void);
-void sa11x0_context_switch __P((void));
-void sa11x0_cpu_sleep __P((int mode));
+void sa11x0_context_switch (void);
+void sa11x0_cpu_sleep (int mode);
-void sa11x0_setup __P((char *string));
+void sa11x0_setup (char *string);
#endif
#if defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110)
-void sa1_setttb __P((u_int ttb));
+void sa1_setttb (u_int ttb);
-void sa1_tlb_flushID_SE __P((u_int va));
+void sa1_tlb_flushID_SE (u_int va);
-void sa1_cache_flushID __P((void));
-void sa1_cache_flushI __P((void));
-void sa1_cache_flushD __P((void));
-void sa1_cache_flushD_SE __P((u_int entry));
+void sa1_cache_flushID (void);
+void sa1_cache_flushI (void);
+void sa1_cache_flushD (void);
+void sa1_cache_flushD_SE (u_int entry);
-void sa1_cache_cleanID __P((void));
-void sa1_cache_cleanD __P((void));
-void sa1_cache_cleanD_E __P((u_int entry));
+void sa1_cache_cleanID (void);
+void sa1_cache_cleanD (void);
+void sa1_cache_cleanD_E (u_int entry);
-void sa1_cache_purgeID __P((void));
-void sa1_cache_purgeID_E __P((u_int entry));
-void sa1_cache_purgeD __P((void));
-void sa1_cache_purgeD_E __P((u_int entry));
+void sa1_cache_purgeID (void);
+void sa1_cache_purgeID_E (u_int entry);
+void sa1_cache_purgeD (void);
+void sa1_cache_purgeD_E (u_int entry);
-void sa1_cache_syncI __P((void));
-void sa1_cache_cleanID_rng __P((vaddr_t start, vsize_t end));
-void sa1_cache_cleanD_rng __P((vaddr_t start, vsize_t end));
-void sa1_cache_purgeID_rng __P((vaddr_t start, vsize_t end));
-void sa1_cache_purgeD_rng __P((vaddr_t start, vsize_t end));
-void sa1_cache_syncI_rng __P((vaddr_t start, vsize_t end));
+void sa1_cache_syncI (void);
+void sa1_cache_cleanID_rng (vaddr_t start, vsize_t end);
+void sa1_cache_cleanD_rng (vaddr_t start, vsize_t end);
+void sa1_cache_purgeID_rng (vaddr_t start, vsize_t end);
+void sa1_cache_purgeD_rng (vaddr_t start, vsize_t end);
+void sa1_cache_syncI_rng (vaddr_t start, vsize_t end);
#endif
#ifdef CPU_ARM9
-void arm9_setttb __P((u_int));
+void arm9_setttb (u_int);
-void arm9_tlb_flushID_SE __P((u_int va));
+void arm9_tlb_flushID_SE (u_int va);
-void arm9_cache_flushID __P((void));
-void arm9_cache_flushID_SE __P((u_int));
-void arm9_cache_flushI __P((void));
-void arm9_cache_flushI_SE __P((u_int));
-void arm9_cache_flushD __P((void));
-void arm9_cache_flushD_SE __P((u_int));
+void arm9_cache_flushID (void);
+void arm9_cache_flushID_SE (u_int);
+void arm9_cache_flushI (void);
+void arm9_cache_flushI_SE (u_int);
+void arm9_cache_flushD (void);
+void arm9_cache_flushD_SE (u_int);
-void arm9_cache_cleanID __P((void));
+void arm9_cache_cleanID (void);
-void arm9_cache_syncI __P((void));
-void arm9_cache_flushID_rng __P((vaddr_t, vsize_t));
-void arm9_cache_flushD_rng __P((vaddr_t, vsize_t));
-void arm9_cache_syncI_rng __P((vaddr_t, vsize_t));
+void arm9_cache_syncI (void);
+void arm9_cache_flushID_rng (vaddr_t, vsize_t);
+void arm9_cache_flushD_rng (vaddr_t, vsize_t);
+void arm9_cache_syncI_rng (vaddr_t, vsize_t);
-void arm9_context_switch __P((void));
+void arm9_context_switch (void);
-void arm9_setup __P((char *string));
+void arm9_setup (char *string);
#endif
#ifdef CPU_ARM10
-void arm10_setttb __P((u_int));
+void arm10_setttb (u_int);
-void arm10_tlb_flushID_SE __P((u_int));
-void arm10_tlb_flushI_SE __P((u_int));
+void arm10_tlb_flushID_SE (u_int);
+void arm10_tlb_flushI_SE (u_int);
-void arm10_icache_sync_all __P((void));
-void arm10_icache_sync_range __P((vaddr_t, vsize_t));
+void arm10_icache_sync_all (void);
+void arm10_icache_sync_range (vaddr_t, vsize_t);
-void arm10_dcache_wbinv_all __P((void));
-void arm10_dcache_wbinv_range __P((vaddr_t, vsize_t));
-void arm10_dcache_inv_range __P((vaddr_t, vsize_t));
-void arm10_dcache_wb_range __P((vaddr_t, vsize_t));
+void arm10_dcache_wbinv_all (void);
+void arm10_dcache_wbinv_range (vaddr_t, vsize_t);
+void arm10_dcache_inv_range (vaddr_t, vsize_t);
+void arm10_dcache_wb_range (vaddr_t, vsize_t);
-void arm10_idcache_wbinv_all __P((void));
-void arm10_idcache_wbinv_range __P((vaddr_t, vsize_t));
+void arm10_idcache_wbinv_all (void);
+void arm10_idcache_wbinv_range (vaddr_t, vsize_t);
-void arm10_context_switch __P((void));
+void arm10_context_switch (void);
-void arm10_setup __P((char *string));
+void arm10_setup (char *string);
extern unsigned arm10_dcache_sets_max;
extern unsigned arm10_dcache_sets_inc;
@@ -365,60 +365,60 @@ extern unsigned arm10_dcache_index_inc;
defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)
-void armv4_tlb_flushID __P((void));
-void armv4_tlb_flushI __P((void));
-void armv4_tlb_flushD __P((void));
-void armv4_tlb_flushD_SE __P((u_int va));
+void armv4_tlb_flushID (void);
+void armv4_tlb_flushI (void);
+void armv4_tlb_flushD (void);
+void armv4_tlb_flushD_SE (u_int va);
-void armv4_drain_writebuf __P((void));
+void armv4_drain_writebuf (void);
#endif
#if defined(CPU_IXP12X0)
-void ixp12x0_drain_readbuf __P((void));
-void ixp12x0_context_switch __P((void));
-void ixp12x0_setup __P((char *string));
+void ixp12x0_drain_readbuf (void);
+void ixp12x0_context_switch (void);
+void ixp12x0_setup (char *string);
#endif
#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
(ARM_MMU_XSCALE == 1)
-void xscale_cpwait __P((void));
+void xscale_cpwait (void);
-void xscale_cpu_sleep __P((int mode));
+void xscale_cpu_sleep (int mode);
-u_int xscale_control __P((u_int clear, u_int bic));
+u_int xscale_control (u_int clear, u_int bic);
-void xscale_setttb __P((u_int ttb));
+void xscale_setttb (u_int ttb);
-void xscale_tlb_flushID_SE __P((u_int va));
+void xscale_tlb_flushID_SE (u_int va);
-void xscale_cache_flushID __P((void));
-void xscale_cache_flushI __P((void));
-void xscale_cache_flushD __P((void));
-void xscale_cache_flushD_SE __P((u_int entry));
+void xscale_cache_flushID (void);
+void xscale_cache_flushI (void);
+void xscale_cache_flushD (void);
+void xscale_cache_flushD_SE (u_int entry);
-void xscale_cache_cleanID __P((void));
-void xscale_cache_cleanD __P((void));
-void xscale_cache_cleanD_E __P((u_int entry));
+void xscale_cache_cleanID (void);
+void xscale_cache_cleanD (void);
+void xscale_cache_cleanD_E (u_int entry);
-void xscale_cache_clean_minidata __P((void));
+void xscale_cache_clean_minidata (void);
-void xscale_cache_purgeID __P((void));
-void xscale_cache_purgeID_E __P((u_int entry));
-void xscale_cache_purgeD __P((void));
-void xscale_cache_purgeD_E __P((u_int entry));
+void xscale_cache_purgeID (void);
+void xscale_cache_purgeID_E (u_int entry);
+void xscale_cache_purgeD (void);
+void xscale_cache_purgeD_E (u_int entry);
-void xscale_cache_syncI __P((void));
-void xscale_cache_cleanID_rng __P((vaddr_t start, vsize_t end));
-void xscale_cache_cleanD_rng __P((vaddr_t start, vsize_t end));
-void xscale_cache_purgeID_rng __P((vaddr_t start, vsize_t end));
-void xscale_cache_purgeD_rng __P((vaddr_t start, vsize_t end));
-void xscale_cache_syncI_rng __P((vaddr_t start, vsize_t end));
-void xscale_cache_flushD_rng __P((vaddr_t start, vsize_t end));
+void xscale_cache_syncI (void);
+void xscale_cache_cleanID_rng (vaddr_t start, vsize_t end);
+void xscale_cache_cleanD_rng (vaddr_t start, vsize_t end);
+void xscale_cache_purgeID_rng (vaddr_t start, vsize_t end);
+void xscale_cache_purgeD_rng (vaddr_t start, vsize_t end);
+void xscale_cache_syncI_rng (vaddr_t start, vsize_t end);
+void xscale_cache_flushD_rng (vaddr_t start, vsize_t end);
-void xscale_context_switch __P((void));
+void xscale_context_switch (void);
-void xscale_setup __P((char *string));
+void xscale_setup (char *string);
#endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */
#define tlb_flush cpu_tlb_flushID
@@ -484,20 +484,20 @@ u_int get_r15(void);
* (in arm/arm/setstack.S)
*/
-void set_stackptr __P((u_int mode, u_int address));
-u_int get_stackptr __P((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 __P((void));
+int get_pc_str_offset (void);
/*
* CPU functions from locore.S
*/
-void cpu_reset __P((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 073bd60d296..25221717e79 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: db_machdep.h,v 1.5 2001/11/22 18:00:00 thorpej Exp $ */
/*
@@ -101,8 +101,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 kdb_trap __P((int, db_regs_t *));
-void db_machine_init __P((void));
+int kdb_trap (int, db_regs_t *);
+void db_machine_init (void);
#define branch_taken(ins, pc, fun, regs) \
db_branch_taken((ins), (pc), (regs))
@@ -111,7 +111,7 @@ void db_machine_init __P((void));
#define DB_ELFSIZE 32
#define DB_NO_AOUT
-void db_show_panic_cmd __P((db_expr_t, int, db_expr_t, char *));
-void db_show_frame_cmd __P((db_expr_t, int, db_expr_t, char *));
+void db_show_panic_cmd (db_expr_t, int, db_expr_t, char *);
+void db_show_frame_cmd (db_expr_t, int, db_expr_t, char *);
#endif /* _ARM_DB_MACHDEP_H_ */
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h
index f294c2643f1..e4bc2e7f503 100644
--- a/sys/arch/arm/include/disklabel.h
+++ b/sys/arch/arm/include/disklabel.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: disklabel.h,v 1.2 2004/02/13 22:48:14 miod Exp $ */
-/* $OpenBSD: disklabel.h,v 1.2 2004/02/13 22:48:14 miod Exp $ */
+/* $OpenBSD: disklabel.h,v 1.3 2004/05/19 03:17:07 drahn Exp $ */
+/* $OpenBSD: disklabel.h,v 1.3 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: disklabel.h,v 1.2 2001/11/25 19:02:03 thorpej Exp $ */
/*
@@ -138,12 +138,12 @@ struct cpu_disklabel {
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 *, char **, int *, int *));
+int mbr_label_read (dev_t, void (*)(struct buf *), struct disklabel *,
+ struct cpu_disklabel *, 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/float.h b/sys/arch/arm/include/float.h
index 1466dd4e7d7..0795daaad25 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: float.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $ */
/*
@@ -51,7 +51,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-extern int __flt_rounds __P((void));
+extern int __flt_rounds (void);
__END_DECLS
#define FLT_RADIX 2 /* b */
diff --git a/sys/arch/arm/include/frame.h b/sys/arch/arm/include/frame.h
index 2db8310770d..3a64436dd4e 100644
--- a/sys/arch/arm/include/frame.h
+++ b/sys/arch/arm/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: frame.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: frame.h,v 1.9 2003/12/01 08:48:33 scw Exp $ */
/*
@@ -164,7 +164,7 @@ struct frame {
};
#ifdef _KERNEL
-void validate_trapframe __P((trapframe_t *, int));
+void validate_trapframe (trapframe_t *, int);
#endif /* _KERNEL */
#else /* _LOCORE */
diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h
index 4abb8321219..dead7bd4433 100644
--- a/sys/arch/arm/include/machdep.h
+++ b/sys/arch/arm/include/machdep.h
@@ -1,27 +1,27 @@
-/* $OpenBSD: machdep.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej 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/arm/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/param.h b/sys/arch/arm/include/param.h
index 7f95b432d07..e8eed68c94f 100644
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.3 2004/04/19 22:55:48 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.4 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $ */
/*
@@ -107,7 +107,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/rtc.h b/sys/arch/arm/include/rtc.h
index 6c6a1666d52..06b0caf175a 100644
--- a/sys/arch/arm/include/rtc.h
+++ b/sys/arch/arm/include/rtc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtc.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: rtc.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: rtc.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $ */
/*
@@ -77,8 +77,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/sysarch.h b/sys/arch/arm/include/sysarch.h
index b379abbecd3..155006b6333 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysarch.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: sysarch.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: sysarch.h,v 1.4 2002/03/30 06:23:39 thorpej Exp $ */
/*
@@ -52,9 +52,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 dfb22764ed7..e3c38ca7e2e 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: undefined.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */
+/* $OpenBSD: undefined.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */
/* $NetBSD: undefined.h,v 1.4 2001/12/20 01:20:23 thorpej Exp $ */
/*
@@ -51,7 +51,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);
#define FP_COPROC 1
#define FP_COPROC2 2
@@ -59,9 +59,9 @@ typedef int (*undef_handler_t) __P((unsigned int, unsigned int, trapframe_t *, i
/* 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
@@ -77,7 +77,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 *);