First round of __P removal in sys

9 files changed, 192 insertions, 192 deletions

diff --git a/sys/arch/hppa/include/autoconf.h b/sys/arch/hppa/include/autoconf.h
index 06c9bcf905f..f926ce872ba 100644
--- a/sys/arch/hppa/include/autoconf.h
+++ b/sys/arch/hppa/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.12 2002/02/12 06:42:26 mickey Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.13 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -58,19 +58,19 @@ struct hppa_mod_info {
 	const char *mi_name;
 };
 
-extern void (*cold_hook) __P((int));
+extern void (*cold_hook)(int);
 #define	HPPA_COLD_COLD	0
 #define	HPPA_COLD_HOT	1   
 #define	HPPA_COLD_OFF	2
 
 struct device;
 
-const char *hppa_mod_info __P((int, int));
-void	pdc_scanbus __P((struct device *, struct confargs *, int bus, int));
-int	mbprint __P((void *, const char *));
-int	mbsubmatch __P((struct device *, void *, void *));
-void	*cpu_intr_establish __P((int pri, int, int (*handler) __P((void *)),
+const char *hppa_mod_info(int, int);
+void	pdc_scanbus(struct device *, struct confargs *, int bus, int);
+int	mbprint(void *, const char *);
+int	mbsubmatch(struct device *, void *, void *);
+void	*cpu_intr_establish __P((int pri, int, int (*handler)(void *),
 				void *arg, struct device *name));
-int	clock_intr __P((void *));
+int	clock_intr(void *);
 
-void	dumpconf	__P((void));
+void	dumpconf(void);
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index ab30eddd3d0..b5a0377eeff 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.18 2002/03/07 18:08:08 jason Exp $	*/
+/*	$OpenBSD: bus.h,v 1.19 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
@@ -47,121 +47,121 @@ typedef u_long bus_space_handle_t;
 struct hppa_bus_space_tag {
 	void *hbt_cookie;
 
-	int  (*hbt_map) __P((void *v, bus_addr_t addr, bus_size_t size,
-			     int cacheable, bus_space_handle_t *bshp));
-	void (*hbt_unmap) __P((void *v, bus_space_handle_t bsh,
-			       bus_size_t size));
-	int  (*hbt_subregion) __P((void *v, bus_space_handle_t bsh,
+	int  (*hbt_map)(void *v, bus_addr_t addr, bus_size_t size,
+			     int cacheable, bus_space_handle_t *bshp);
+	void (*hbt_unmap)(void *v, bus_space_handle_t bsh,
+			       bus_size_t size);
+	int  (*hbt_subregion)(void *v, bus_space_handle_t bsh,
 				   bus_size_t offset, bus_size_t size,
-				   bus_space_handle_t *nbshp));
-	int  (*hbt_alloc) __P((void *v, bus_addr_t rstart, bus_addr_t rend,
+				   bus_space_handle_t *nbshp);
+	int  (*hbt_alloc)(void *v, 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));
-	void (*hbt_free) __P((void *, bus_space_handle_t, bus_size_t));
-	void (*hbt_barrier) __P((void *v, bus_space_handle_t h,
-				 bus_size_t o, bus_size_t l, int op));
-
-	u_int8_t  (*hbt_r1) __P((void *, bus_space_handle_t, bus_size_t));
-	u_int16_t (*hbt_r2) __P((void *, bus_space_handle_t, bus_size_t));
-	u_int32_t (*hbt_r4) __P((void *, bus_space_handle_t, bus_size_t));
-	u_int64_t (*hbt_r8) __P((void *, bus_space_handle_t, bus_size_t));
-
-	void (*hbt_w1)__P((void *, bus_space_handle_t, bus_size_t, u_int8_t));
-	void (*hbt_w2)__P((void *, bus_space_handle_t, bus_size_t, u_int16_t));
-	void (*hbt_w4)__P((void *, bus_space_handle_t, bus_size_t, u_int32_t));
-	void (*hbt_w8)__P((void *, bus_space_handle_t, bus_size_t, u_int64_t));
-
-	void (*hbt_rm_1) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rm_2) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int16_t *a, bus_size_t c));
-	void (*hbt_rm_4) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int32_t *a, bus_size_t c));
-	void (*hbt_rm_8) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int64_t *a, bus_size_t c));
-
-	void (*hbt_wm_1) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      const u_int8_t *a, bus_size_t c));
-	void (*hbt_wm_2) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      const u_int16_t *a, bus_size_t c));
-	void (*hbt_wm_4) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      const u_int32_t *a, bus_size_t c));
-	void (*hbt_wm_8) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      const u_int64_t *a, bus_size_t c));
-
-	void (*hbt_sm_1) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      u_int8_t  vv, bus_size_t c));
-	void (*hbt_sm_2) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      u_int16_t vv, bus_size_t c));
-	void (*hbt_sm_4) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      u_int32_t vv, bus_size_t c));
-	void (*hbt_sm_8) __P((void *v, bus_space_handle_t h, bus_size_t o,
-			      u_int64_t vv, bus_size_t c));
-
-	void (*hbt_rrm_2) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rrm_4) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rrm_8) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-
-	void (*hbt_wrm_2) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-	void (*hbt_wrm_4) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-	void (*hbt_wrm_8) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-
-	void (*hbt_rr_1) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rr_2) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int16_t *a, bus_size_t c));
-	void (*hbt_rr_4) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int32_t *a, bus_size_t c));
-	void (*hbt_rr_8) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, u_int64_t *a, bus_size_t c));
-
-	void (*hbt_wr_1) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, const u_int8_t *a, bus_size_t c));
-	void (*hbt_wr_2) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, const u_int16_t *a, bus_size_t c));
-	void (*hbt_wr_4) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, const u_int32_t *a, bus_size_t c));
-	void (*hbt_wr_8) __P((void *v, bus_space_handle_t h,
-			      bus_size_t o, const u_int64_t *a, bus_size_t c));
-
-	void (*hbt_rrr_2) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rrr_4) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-	void (*hbt_rrr_8) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t *a, bus_size_t c));
-
-	void (*hbt_wrr_2) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-	void (*hbt_wrr_4) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-	void (*hbt_wrr_8) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, const u_int8_t *a, bus_size_t c));
-
-	void (*hbt_sr_1) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int8_t vv, bus_size_t c));
-	void (*hbt_sr_2) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int16_t vv, bus_size_t c));
-	void (*hbt_sr_4) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int32_t vv, bus_size_t c));
-	void (*hbt_sr_8) __P((void *v, bus_space_handle_t h,
-			       bus_size_t o, u_int64_t vv, bus_size_t c));
-
-	void (*hbt_cp_1) __P((void *v, bus_space_handle_t h1, bus_size_t o1,
-			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c));
-	void (*hbt_cp_2) __P((void *v, bus_space_handle_t h1, bus_size_t o1,
-			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c));
-	void (*hbt_cp_4) __P((void *v, bus_space_handle_t h1, bus_size_t o1,
-			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c));
-	void (*hbt_cp_8) __P((void *v, bus_space_handle_t h1, bus_size_t o1,
-			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c));
+			       bus_addr_t *addrp, bus_space_handle_t *bshp);
+	void (*hbt_free)(void *, bus_space_handle_t, bus_size_t);
+	void (*hbt_barrier)(void *v, bus_space_handle_t h,
+				 bus_size_t o, bus_size_t l, int op);
+
+	u_int8_t  (*hbt_r1)(void *, bus_space_handle_t, bus_size_t);
+	u_int16_t (*hbt_r2)(void *, bus_space_handle_t, bus_size_t);
+	u_int32_t (*hbt_r4)(void *, bus_space_handle_t, bus_size_t);
+	u_int64_t (*hbt_r8)(void *, bus_space_handle_t, bus_size_t);
+
+	void (*hbt_w1)(void *, bus_space_handle_t, bus_size_t, u_int8_t);
+	void (*hbt_w2)(void *, bus_space_handle_t, bus_size_t, u_int16_t);
+	void (*hbt_w4)(void *, bus_space_handle_t, bus_size_t, u_int32_t);
+	void (*hbt_w8)(void *, bus_space_handle_t, bus_size_t, u_int64_t);
+
+	void (*hbt_rm_1)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rm_2)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int16_t *a, bus_size_t c);
+	void (*hbt_rm_4)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int32_t *a, bus_size_t c);
+	void (*hbt_rm_8)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int64_t *a, bus_size_t c);
+
+	void (*hbt_wm_1)(void *v, bus_space_handle_t h, bus_size_t o,
+			      const u_int8_t *a, bus_size_t c);
+	void (*hbt_wm_2)(void *v, bus_space_handle_t h, bus_size_t o,
+			      const u_int16_t *a, bus_size_t c);
+	void (*hbt_wm_4)(void *v, bus_space_handle_t h, bus_size_t o,
+			      const u_int32_t *a, bus_size_t c);
+	void (*hbt_wm_8)(void *v, bus_space_handle_t h, bus_size_t o,
+			      const u_int64_t *a, bus_size_t c);
+
+	void (*hbt_sm_1)(void *v, bus_space_handle_t h, bus_size_t o,
+			      u_int8_t  vv, bus_size_t c);
+	void (*hbt_sm_2)(void *v, bus_space_handle_t h, bus_size_t o,
+			      u_int16_t vv, bus_size_t c);
+	void (*hbt_sm_4)(void *v, bus_space_handle_t h, bus_size_t o,
+			      u_int32_t vv, bus_size_t c);
+	void (*hbt_sm_8)(void *v, bus_space_handle_t h, bus_size_t o,
+			      u_int64_t vv, bus_size_t c);
+
+	void (*hbt_rrm_2)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rrm_4)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rrm_8)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+
+	void (*hbt_wrm_2)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+	void (*hbt_wrm_4)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+	void (*hbt_wrm_8)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+
+	void (*hbt_rr_1)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rr_2)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int16_t *a, bus_size_t c);
+	void (*hbt_rr_4)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int32_t *a, bus_size_t c);
+	void (*hbt_rr_8)(void *v, bus_space_handle_t h,
+			      bus_size_t o, u_int64_t *a, bus_size_t c);
+
+	void (*hbt_wr_1)(void *v, bus_space_handle_t h,
+			      bus_size_t o, const u_int8_t *a, bus_size_t c);
+	void (*hbt_wr_2)(void *v, bus_space_handle_t h,
+			      bus_size_t o, const u_int16_t *a, bus_size_t c);
+	void (*hbt_wr_4)(void *v, bus_space_handle_t h,
+			      bus_size_t o, const u_int32_t *a, bus_size_t c);
+	void (*hbt_wr_8)(void *v, bus_space_handle_t h,
+			      bus_size_t o, const u_int64_t *a, bus_size_t c);
+
+	void (*hbt_rrr_2)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rrr_4)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+	void (*hbt_rrr_8)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t *a, bus_size_t c);
+
+	void (*hbt_wrr_2)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+	void (*hbt_wrr_4)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+	void (*hbt_wrr_8)(void *v, bus_space_handle_t h,
+			       bus_size_t o, const u_int8_t *a, bus_size_t c);
+
+	void (*hbt_sr_1)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int8_t vv, bus_size_t c);
+	void (*hbt_sr_2)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int16_t vv, bus_size_t c);
+	void (*hbt_sr_4)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int32_t vv, bus_size_t c);
+	void (*hbt_sr_8)(void *v, bus_space_handle_t h,
+			       bus_size_t o, u_int64_t vv, bus_size_t c);
+
+	void (*hbt_cp_1)(void *v, bus_space_handle_t h1, bus_size_t o1,
+			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+	void (*hbt_cp_2)(void *v, bus_space_handle_t h1, bus_size_t o1,
+			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+	void (*hbt_cp_4)(void *v, bus_space_handle_t h1, bus_size_t o1,
+			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
+	void (*hbt_cp_8)(void *v, bus_space_handle_t h1, bus_size_t o1,
+			      bus_space_handle_t h2, bus_size_t o2, bus_size_t c);
 };
 typedef const struct hppa_bus_space_tag *bus_space_tag_t;
 extern const struct hppa_bus_space_tag hppa_bustag;
@@ -338,32 +338,32 @@ struct hppa_bus_dma_tag {
 	/*
 	 * DMA mapping methods.
 	 */
-	int	(*_dmamap_create) __P((void *, bus_size_t, int,
-		    bus_size_t, bus_size_t, int, bus_dmamap_t *));
-	void	(*_dmamap_destroy) __P((void *, bus_dmamap_t));
-	int	(*_dmamap_load) __P((void *, bus_dmamap_t, void *,
-		    bus_size_t, struct proc *, int));
-	int	(*_dmamap_load_mbuf) __P((void *, bus_dmamap_t,
-		    struct mbuf *, int));
-	int	(*_dmamap_load_uio) __P((void *, bus_dmamap_t,
-		    struct uio *, int));
-	int	(*_dmamap_load_raw) __P((void *, bus_dmamap_t,
-		    bus_dma_segment_t *, int, bus_size_t, int));
-	void	(*_dmamap_unload) __P((void *, bus_dmamap_t));
-	void	(*_dmamap_sync) __P((void *, bus_dmamap_t, bus_addr_t,
-		    bus_size_t, int));
+	int	(*_dmamap_create)(void *, bus_size_t, int,
+		    bus_size_t, bus_size_t, int, bus_dmamap_t *);
+	void	(*_dmamap_destroy)(void *, bus_dmamap_t);
+	int	(*_dmamap_load)(void *, bus_dmamap_t, void *,
+		    bus_size_t, struct proc *, int);
+	int	(*_dmamap_load_mbuf)(void *, bus_dmamap_t,
+		    struct mbuf *, int);
+	int	(*_dmamap_load_uio)(void *, bus_dmamap_t,
+		    struct uio *, int);
+	int	(*_dmamap_load_raw)(void *, bus_dmamap_t,
+		    bus_dma_segment_t *, int, bus_size_t, int);
+	void	(*_dmamap_unload)(void *, bus_dmamap_t);
+	void	(*_dmamap_sync)(void *, bus_dmamap_t, bus_addr_t,
+		    bus_size_t, int);
 
 	/*
 	 * DMA memory utility functions.
 	 */
-	int	(*_dmamem_alloc) __P((void *, bus_size_t, bus_size_t,
-		    bus_size_t, bus_dma_segment_t *, int, int *, int));
-	void	(*_dmamem_free) __P((void *, bus_dma_segment_t *, int));
-	int	(*_dmamem_map) __P((void *, bus_dma_segment_t *,
-		    int, size_t, caddr_t *, int));
-	void	(*_dmamem_unmap) __P((void *, caddr_t, size_t));
-	paddr_t	(*_dmamem_mmap) __P((void *, bus_dma_segment_t *,
-		    int, off_t, int, int));
+	int	(*_dmamem_alloc)(void *, bus_size_t, bus_size_t,
+		    bus_size_t, bus_dma_segment_t *, int, int *, int);
+	void	(*_dmamem_free)(void *, bus_dma_segment_t *, int);
+	int	(*_dmamem_map)(void *, bus_dma_segment_t *,
+		    int, size_t, caddr_t *, int);
+	void	(*_dmamem_unmap)(void *, caddr_t, size_t);
+	paddr_t	(*_dmamem_mmap)(void *, bus_dma_segment_t *,
+		    int, off_t, int, int);
 };
 
 #define	bus_dmamap_create(t, s, n, m, b, f, p)			\
diff --git a/sys/arch/hppa/include/conf.h b/sys/arch/hppa/include/conf.h
index 987e5db6e2a..c4ea83d576f 100644
--- a/sys/arch/hppa/include/conf.h
+++ b/sys/arch/hppa/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.2 1998/10/30 19:16:33 mickey Exp $	*/
+/*	$OpenBSD: conf.h,v 1.3 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -38,8 +38,8 @@ struct tty;
 struct termios;
 
 cdev_decl(pdc);
-int pdcparam __P((struct tty *, struct termios *));
-void pdcstart __P((struct tty *));
+int pdcparam(struct tty *, struct termios *);
+void pdcstart(struct tty *);
 
 cdev_decl(fd);
 bdev_decl(fd);
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h
index 0717e74778a..3dae3c6d2aa 100644
--- a/sys/arch/hppa/include/cpu.h
+++ b/sys/arch/hppa/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.27 2002/02/16 02:41:15 mickey Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.28 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 2000-2001 Michael Shalayeff
@@ -125,20 +125,20 @@ extern int want_resched;
 
 #define DELAY(x) delay(x)
 
-extern int (*cpu_desidhash) __P((void));
-
-void	delay __P((u_int us));
-void	hppa_init __P((paddr_t start));
-void	trap __P((int type, struct trapframe *frame));
-int	spcopy __P((pa_space_t ssp, const void *src,
-		    pa_space_t dsp, void *dst, size_t size));
-int	spstrcpy __P((pa_space_t ssp, const void *src,
-		      pa_space_t dsp, void *dst, size_t size, size_t *rsize));
-int	copy_on_fault __P((void));
-void	switch_trampoline __P((void));
-void	switch_exit __P((struct proc *p));
-int	cpu_dumpsize __P((void));
-int	cpu_dump __P((void));
+extern int (*cpu_desidhash)(void);
+
+void	delay(u_int us);
+void	hppa_init(paddr_t start);
+void	trap(int type, struct trapframe *frame);
+int	spcopy(pa_space_t ssp, const void *src,
+		    pa_space_t dsp, void *dst, size_t size);
+int	spstrcpy(pa_space_t ssp, const void *src,
+		      pa_space_t dsp, void *dst, size_t size, size_t *rsize);
+int	copy_on_fault(void);
+void	switch_trampoline(void);
+void	switch_exit(struct proc *p);
+int	cpu_dumpsize(void);
+int	cpu_dump(void);
 #endif
 
 /*
diff --git a/sys/arch/hppa/include/cpufunc.h b/sys/arch/hppa/include/cpufunc.h
index 560b2d34dad..b967a53614d 100644
--- a/sys/arch/hppa/include/cpufunc.h
+++ b/sys/arch/hppa/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.18 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998,2000 Michael Shalayeff
@@ -218,14 +218,14 @@ ledctl(int on, int off, int toggle)
 #endif
 
 #ifdef _KERNEL
-void ficache __P((pa_space_t sp, vaddr_t va, vsize_t size));
-void fdcache __P((pa_space_t sp, vaddr_t va, vsize_t size));
-void pdcache __P((pa_space_t sp, vaddr_t va, vsize_t size));
-void fcacheall __P((void));
-void ptlball __P((void));
-int btlb_insert __P((pa_space_t space, vaddr_t va, paddr_t pa,
-		     vsize_t *lenp, u_int prot));
-hppa_hpa_t cpu_gethpa __P((int n));
+void ficache(pa_space_t sp, vaddr_t va, vsize_t size);
+void fdcache(pa_space_t sp, vaddr_t va, vsize_t size);
+void pdcache(pa_space_t sp, vaddr_t va, vsize_t size);
+void fcacheall(void);
+void ptlball(void);
+int btlb_insert(pa_space_t space, vaddr_t va, paddr_t pa,
+		     vsize_t *lenp, u_int prot);
+hppa_hpa_t cpu_gethpa(int n);
 #endif
 
 #endif /* _MACHINE_CPUFUNC_H_ */
diff --git a/sys/arch/hppa/include/db_machdep.h b/sys/arch/hppa/include/db_machdep.h
index bf497044a8e..d4003aa932a 100644
--- a/sys/arch/hppa/include/db_machdep.h
+++ b/sys/arch/hppa/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.6 2001/11/06 19:53:14 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.7 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -93,7 +93,7 @@ static __inline int inst_trap_return(u_int ins)	{
 #define db_clear_single_step(r)	((r)->tf_flags |= 0)
 #define db_set_single_step(r)	((r)->tf_flags |= 0)
 
-int db_valid_breakpoint __P((db_addr_t));
-int kdb_trap __P((int, int, db_regs_t *));
+int db_valid_breakpoint(db_addr_t);
+int kdb_trap(int, int, db_regs_t *);
 
 #endif /* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/iomod.h b/sys/arch/hppa/include/iomod.h
index 88d599665ee..17cc3e47ed2 100644
--- a/sys/arch/hppa/include/iomod.h
+++ b/sys/arch/hppa/include/iomod.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iomod.h,v 1.9 2001/12/02 04:10:25 mickey Exp $	*/
+/*	$OpenBSD: iomod.h,v 1.10 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -151,10 +151,10 @@
 struct pagezero {
 	/* [0x000] Initialize Vectors */
 	int	ivec_special;		/* must be zero */
-	int	(*ivec_mempf)__P((void)); /* powerfail recovery software */
-	int	(*ivec_toc)__P((void));	/* exec'd after Transfer Of Control */
+	int	(*ivec_mempf)(void); /* powerfail recovery software */
+	int	(*ivec_toc)(void);	/* exec'd after Transfer Of Control */
 	u_int	ivec_toclen;		/* bytes of ivec_toc code */
-	int	(*ivec_rendz)__P((void)); /* exec'd after Rendezvous Signal */
+	int	(*ivec_rendz)(void); /* exec'd after Rendezvous Signal */
 	u_int	ivec_mempflen;		/* bytes of ivec_mempf code */
 	u_int	ivec_resv[2];		/* (reserved) */
 	u_int	ivec_mbz;		/* must be zero */
@@ -212,7 +212,7 @@ struct pagezero {
 	struct boot_err mem_be[8];	/* boot errors (see above) */
 	u_int	mem_free;		/* first free phys. memory location */
 	u_int	mem_hpa;		/* HPA of CPU */
-	int	(*mem_pdc)__P((void));	/* PDC entry point */
+	int	(*mem_pdc)(void);	/* PDC entry point */
 	u_int	mem_10msec;		/* # of Interval Timer ticks in 10msec*/
 
 	/* [0x390] Initial Memory Module */
diff --git a/sys/arch/hppa/include/pdc.h b/sys/arch/hppa/include/pdc.h
index 09ca3ec7dec..26487be741c 100644
--- a/sys/arch/hppa/include/pdc.h
+++ b/sys/arch/hppa/include/pdc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.h,v 1.18 2002/02/08 21:15:35 miod Exp $	*/
+/*	$OpenBSD: pdc.h,v 1.19 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1990 mt Xinu, Inc.  All rights reserved.
@@ -262,8 +262,8 @@
 
 struct iomod;
 
-typedef int (*pdcio_t) __P((int, int, ...));
-typedef int (*iodcio_t) __P((struct iomod *, int, ...));
+typedef int (*pdcio_t)(int, int, ...);
+typedef int (*iodcio_t)(struct iomod *, int, ...);
 
 /*
  * Commonly used PDC calls and the structures they return.
@@ -629,14 +629,14 @@ struct consdev;
 
 extern int kernelmapped;
 
-void pdc_init __P((void));
-int pdc_call __P((iodcio_t, int, ...));
+void pdc_init(void);
+int pdc_call(iodcio_t, int, ...);
 
-void pdccnprobe __P((struct consdev *));
-void pdccninit __P((struct consdev *));
-int pdccngetc __P((dev_t));
-void pdccnputc __P((dev_t, int));
-void pdccnpollc __P((dev_t, int));
+void pdccnprobe(struct consdev *);
+void pdccninit(struct consdev *);
+int pdccngetc(dev_t);
+void pdccnputc(dev_t, int);
+void pdccnpollc(dev_t, int);
 #endif
 
 #endif	/* !(_LOCORE) */
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index b9924dbda60..872c71e20d0 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.17 2002/02/21 06:12:31 mickey Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.18 2002/03/14 01:26:32 millert Exp $	*/
 
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
@@ -149,7 +149,7 @@ struct pv_page {
 #define KERNEL_DATA_PROT (TLB_AR_KRW | (KERNEL_ACCESS_ID << 1))
 
 #ifdef _KERNEL
-extern void gateway_page __P((void));
+extern void gateway_page(void);
 
 #define	PMAP_STEAL_MEMORY	/* we have some memory to steal */
 
@@ -194,7 +194,7 @@ pmap_prot(struct pmap *pmap, int prot)
 	return (pmap == kernel_pmap? kern_prot: user_prot)[prot];
 }
 
-void pmap_bootstrap __P((vaddr_t *, vaddr_t *));
+void pmap_bootstrap(vaddr_t *, vaddr_t *);
 #endif /* _KERNEL */
 
 #endif /* _MACHINE_PMAP_H_ */