First round of __P removal in sys

11 files changed, 199 insertions, 200 deletions

diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index 71285efbb7e..d66a7e7f881 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.4 2002/03/07 18:08:08 jason Exp $	*/
+/*	$OpenBSD: bus.h,v 1.5 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $	*/
 
 /*-
@@ -115,24 +115,24 @@ struct vax_bus_space {
 	void		*vbs_cookie;
 
 	/* mapping/unmapping */
-	int		(*vbs_map) __P((void *, bus_addr_t, bus_size_t,
-			    int, bus_space_handle_t *, int));
-	void		(*vbs_unmap) __P((void *, bus_space_handle_t,
-			    bus_size_t, int));
-	int		(*vbs_subregion) __P((void *, bus_space_handle_t,
-			    bus_size_t, bus_size_t, bus_space_handle_t *));
+	int		(*vbs_map)(void *, bus_addr_t, bus_size_t,
+			    int, bus_space_handle_t *, int);
+	void		(*vbs_unmap)(void *, bus_space_handle_t,
+			    bus_size_t, int);
+	int		(*vbs_subregion)(void *, bus_space_handle_t,
+			    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 	/* allocation/deallocation */
-	int		(*vbs_alloc) __P((void *, bus_addr_t, bus_addr_t,
+	int		(*vbs_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		(*vbs_free) __P((void *, bus_space_handle_t,
-			    bus_size_t));
+			    bus_addr_t *, bus_space_handle_t *);
+	void		(*vbs_free)(void *, bus_space_handle_t,
+			    bus_size_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.
  */
@@ -147,8 +147,8 @@ struct vax_bus_space {
 	(*(t)->vbs_map)((t)->vbs_cookie, (a), (s), (f), (hp), 0)
 
 /*
- *	int bus_space_unmap __P((bus_space_tag_t t,
- *	    bus_space_handle_t bsh, bus_size_t size));
+ *	int bus_space_unmap(bus_space_tag_t t,
+ *	    bus_space_handle_t bsh, bus_size_t size);
  *
  * Unmap a region of bus space.
  */
@@ -159,9 +159,9 @@ struct vax_bus_space {
 	(*(t)->vbs_unmap)((t)->vbs_cookie, (h), (s), 0)
 
 /*
- *	int bus_space_subregion __P((bus_space_tag_t t,
+ *	int bus_space_subregion(bus_space_tag_t t,
  *	    bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
- *	    bus_space_handle_t *nbshp));
+ *	    bus_space_handle_t *nbshp);
  *
  * Get a new handle for a subregion of an already-mapped area of bus space.
  */
@@ -170,10 +170,10 @@ struct vax_bus_space {
 	(*(t)->vbs_subregion)((t)->vbs_cookie, (h), (o), (s), (nhp))
 
 /*
- *	int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
+ *	int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
  *	    bus_addr_t rend, bus_size_t size, bus_size_t align,
  *	    bus_size_t boundary, int flags, bus_addr_t *addrp,
- *	    bus_space_handle_t *bshp));
+ *	    bus_space_handle_t *bshp);
  *
  * Allocate a region of bus space.
  */
@@ -183,8 +183,8 @@ struct vax_bus_space {
 	    (f), (ap), (hp))
 
 /*
- *	int bus_space_free __P((bus_space_tag_t t,
- *	    bus_space_handle_t bsh, bus_size_t size));
+ *	int bus_space_free(bus_space_tag_t t,
+ *	    bus_space_handle_t bsh, bus_size_t size);
  *
  * Free a region of bus space.
  */
@@ -193,8 +193,8 @@ struct vax_bus_space {
 	(*(t)->vbs_free)((t)->vbs_cookie, (h), (s))
 
 /*
- *	u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- *	    bus_space_handle_t bsh, bus_size_t offset));
+ *	u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ *	    bus_space_handle_t bsh, bus_size_t offset);
  *
  * Read a 1, 2, 4, or 8 byte quantity from bus space
  * described by tag/handle/offset.
@@ -216,19 +216,19 @@ struct vax_bus_space {
 #endif
 
 /*
- *	void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t *addr, size_t count));
+ *	    u_intN_t *addr, size_t count);
  *
  * Read `count' 1, 2, 4, or 8 byte quantities from bus space
  * described by tag/handle/offset and copy into buffer provided.
  */
-static __inline void vax_mem_read_multi_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int8_t *, size_t));
-static __inline void vax_mem_read_multi_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int16_t *, size_t));
-static __inline void vax_mem_read_multi_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int32_t *, size_t));
+static __inline void vax_mem_read_multi_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int8_t *, size_t);
+static __inline void vax_mem_read_multi_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int16_t *, size_t);
+static __inline void vax_mem_read_multi_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int32_t *, size_t);
 
 #define	bus_space_read_multi_1(t, h, o, a, c)				\
 	vax_mem_read_multi_1((t), (h), (o), (a), (c))
@@ -294,21 +294,21 @@ vax_mem_read_multi_4(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_read_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t *addr, size_t count));
+ *	    u_intN_t *addr, size_t count);
  *
  * Read `count' 1, 2, 4, or 8 byte quantities from bus space
  * described by tag/handle and starting at `offset' and copy into
  * buffer provided.
  */
 
-static __inline void vax_mem_read_region_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int8_t *, size_t));
-static __inline void vax_mem_read_region_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int16_t *, size_t));
-static __inline void vax_mem_read_region_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int32_t *, size_t));
+static __inline void vax_mem_read_region_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int8_t *, size_t);
+static __inline void vax_mem_read_region_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int16_t *, size_t);
+static __inline void vax_mem_read_region_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int32_t *, size_t);
 
 #define	bus_space_read_region_1(t, h, o, a, c)				\
 do {									\
@@ -377,9 +377,9 @@ vax_mem_read_region_4(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_write_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    u_intN_t value));
+ *	    u_intN_t value);
  *
  * Write the 1, 2, 4, or 8 byte value `value' to bus space
  * described by tag/handle/offset.
@@ -407,19 +407,19 @@ do {									\
 #endif
 
 /*
- *	void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_intN_t *addr, size_t count));
+ *	    const u_intN_t *addr, size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
  * provided to bus space described by tag/handle/offset.
  */
-static __inline void vax_mem_write_multi_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int8_t *, size_t));
-static __inline void vax_mem_write_multi_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int16_t *, size_t));
-static __inline void vax_mem_write_multi_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int32_t *, size_t));
+static __inline void vax_mem_write_multi_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int8_t *, size_t);
+static __inline void vax_mem_write_multi_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int16_t *, size_t);
+static __inline void vax_mem_write_multi_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int32_t *, size_t);
 
 #define	bus_space_write_multi_1(t, h, o, a, c)				\
 do {									\
@@ -488,19 +488,19 @@ vax_mem_write_multi_4(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_write_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_intN_t *addr, size_t count));
+ *	    const u_intN_t *addr, size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * to bus space described by tag/handle starting at `offset'.
  */
-static __inline void vax_mem_write_region_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int8_t *, size_t));
-static __inline void vax_mem_write_region_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int16_t *, size_t));
-static __inline void vax_mem_write_region_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, const u_int32_t *, size_t));
+static __inline void vax_mem_write_region_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int8_t *, size_t);
+static __inline void vax_mem_write_region_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int16_t *, size_t);
+static __inline void vax_mem_write_region_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, const u_int32_t *, size_t);
 
 #define	bus_space_write_region_1(t, h, o, a, c)				\
 	vax_mem_write_region_1((t), (h), (o), (a), (c))
@@ -567,20 +567,20 @@ vax_mem_write_region_4(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_multi_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- *	    size_t count));
+ *	    size_t count);
  *
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
  */
 
-static __inline void vax_mem_set_multi_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int8_t, size_t));
-static __inline void vax_mem_set_multi_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int16_t, size_t));
-static __inline void vax_mem_set_multi_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int32_t, size_t));
+static __inline void vax_mem_set_multi_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int8_t, size_t);
+static __inline void vax_mem_set_multi_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int16_t, size_t);
+static __inline void vax_mem_set_multi_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int32_t, size_t);
 
 #define	bus_space_set_multi_1(t, h, o, v, c)				\
 	vax_mem_set_multi_1((t), (h), (o), (v), (c))
@@ -644,20 +644,20 @@ vax_mem_set_multi_4(t, h, o, v, c)
 #endif
 
 /*
- *	void bus_space_set_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_set_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- *	    size_t count));
+ *	    size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle starting at `offset'.
  */
 
-static __inline void vax_mem_set_region_1 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int8_t, size_t));
-static __inline void vax_mem_set_region_2 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int16_t, size_t));
-static __inline void vax_mem_set_region_4 __P((bus_space_tag_t,
-	bus_space_handle_t, bus_size_t, u_int32_t, size_t));
+static __inline void vax_mem_set_region_1(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int8_t, size_t);
+static __inline void vax_mem_set_region_2(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int16_t, size_t);
+static __inline void vax_mem_set_region_4(bus_space_tag_t,
+	bus_space_handle_t, bus_size_t, u_int32_t, size_t);
 
 #define	bus_space_set_region_1(t, h, o, v, c)				\
 	vax_mem_set_region_1((t), (h), (o), (v), (c))
@@ -721,24 +721,24 @@ vax_mem_set_region_4(t, h, o, v, c)
 #endif
 
 /*
- *	void bus_space_copy_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_copy_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh1, bus_size_t off1,
  *	    bus_space_handle_t bsh2, bus_size_t off2,
- *	    size_t count));
+ *	    size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
  * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
  */
 
-static __inline void vax_mem_copy_region_1 __P((bus_space_tag_t,
+static __inline void vax_mem_copy_region_1(bus_space_tag_t,
 	bus_space_handle_t, bus_size_t, bus_space_handle_t,
-	bus_size_t, size_t));
-static __inline void vax_mem_copy_region_2 __P((bus_space_tag_t,
+	bus_size_t, size_t);
+static __inline void vax_mem_copy_region_2(bus_space_tag_t,
 	bus_space_handle_t, bus_size_t, bus_space_handle_t,
-	bus_size_t, size_t));
-static __inline void vax_mem_copy_region_4 __P((bus_space_tag_t,
+	bus_size_t, size_t);
+static __inline void vax_mem_copy_region_4(bus_space_tag_t,
 	bus_space_handle_t, bus_size_t, bus_space_handle_t,
-	bus_size_t, size_t));
+	bus_size_t, size_t);
 
 #define	bus_space_copy_region_1(t, h1, o1, h2, o2, c)			\
 	vax_mem_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
@@ -843,9 +843,9 @@ vax_mem_copy_region_4(t, h1, o1, h2, o2, c)
 /*
  * Bus read/write barrier methods.
  *
- *	void bus_space_barrier __P((bus_space_tag_t tag,
+ *	void bus_space_barrier(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    bus_size_t len, int flags));
+ *	    bus_size_t len, int flags);
  *
  * Note: the vax does not currently require barriers, but we must
  * provide the flags to MI code.
@@ -952,38 +952,38 @@ struct vax_bus_dma_tag {
 	 * Internal-use only utility methods.  NOT TO BE USED BY
 	 * MACHINE-INDEPENDENT CODE!
 	 */
-	bus_dma_tag_t (*_get_tag) __P((bus_dma_tag_t, vax_bus_t));
+	bus_dma_tag_t (*_get_tag)(bus_dma_tag_t, vax_bus_t);
 
 	/*
 	 * 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	vaxbus_dma_get_tag(t, b)				\
@@ -1049,34 +1049,34 @@ struct vax_bus_dmamap {
 };
 
 #ifdef _VAX_BUS_DMA_PRIVATE
-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));
+	    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);
 #endif /* _VAX_BUS_DMA_PRIVATE */
 
 #endif /* _VAX_BUS_H_ */
diff --git a/sys/arch/vax/include/clock.h b/sys/arch/vax/include/clock.h
index e5f7d9c833e..a5a53365087 100644
--- a/sys/arch/vax/include/clock.h
+++ b/sys/arch/vax/include/clock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.h,v 1.4 2000/04/26 03:08:40 bjc Exp $ */
+/*	$OpenBSD: clock.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */
 /*	$NetBSD: clock.h,v 1.4 1999/09/06 19:52:53 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -70,7 +70,7 @@ extern	volatile short *clk_page;
 extern	int clk_adrshift, clk_tweak;
 
 /* Prototypes */
-int	generic_clkread __P((time_t));
-void	generic_clkwrite __P((void));
-int	chip_clkread __P((time_t));
-void	chip_clkwrite __P((void));
+int	generic_clkread(time_t);
+void	generic_clkwrite(void);
+int	chip_clkread(time_t);
+void	chip_clkwrite(void);
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index cdb3c3bccd0..bb24a2bc2d4 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cpu.h,v 1.11 2001/05/05 22:34:26 art Exp $      */
+/*      $OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:48 millert Exp $      */
 /*      $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $      */
 
 /*
@@ -53,19 +53,19 @@
  * struct for the current cpu is set up in locore.c.
  */
 struct	cpu_dep {
-	void	(*cpu_steal_pages) __P((void)); /* pmap init before mm is on */
-	int	(*cpu_mchk) __P((caddr_t));   /* Machine check handling */
-	void	(*cpu_memerr) __P((void)); /* Memory subsystem errors */
+	void	(*cpu_steal_pages)(void); /* pmap init before mm is on */
+	int	(*cpu_mchk)(caddr_t);   /* Machine check handling */
+	void	(*cpu_memerr)(void); /* Memory subsystem errors */
 	    /* Autoconfiguration */
-	void	(*cpu_conf) __P((void));
-	int	(*cpu_clkread) __P((time_t));	/* Read cpu clock time */
-	void	(*cpu_clkwrite) __P((void));	/* Write system time to cpu */
+	void	(*cpu_conf)(void);
+	int	(*cpu_clkread)(time_t);	/* Read cpu clock time */
+	void	(*cpu_clkwrite)(void);	/* Write system time to cpu */
 	short	cpu_vups;	/* speed of cpu */
 	short	cpu_scbsz;	/* (estimated) size of system control block */
-	void	(*cpu_halt) __P((void)); /* Cpu dependent halt call */
-	void	(*cpu_reboot) __P((int)); /* Cpu dependent reboot call */
-	void	(*cpu_clrf) __P((void)); /* Clear cold/warm start flags */
-	void	(*cpu_subconf) __P((struct device *));/*config cpu dep. devs */
+	void	(*cpu_halt)(void); /* Cpu dependent halt call */
+	void	(*cpu_reboot)(int); /* Cpu dependent reboot call */
+	void	(*cpu_clrf)(void); /* Clear cold/warm start flags */
+	void	(*cpu_subconf)(struct device *);/*config cpu dep. devs */
 };
 
 extern struct cpu_dep *dep_call; /* Holds pointer to current CPU struct. */
@@ -116,24 +116,24 @@ extern	int     want_resched;   /* resched() was called */
 struct device;
 
 /* Some low-level prototypes */
-int	badaddr __P((caddr_t, int));
-void	cpu_swapin __P((struct proc *));
-int	hp_getdev __P((int, int, struct device **));
-int	sd_getdev __P((int, int, int, int, char **));
-int	ra_getdev __P((int, int, int, char **));
-int	bdevtomaj __P((int));
-void	dumpconf __P((void));
-void	dumpsys __P((void));
-void	swapconf __P((void));
-void	disk_printtype __P((int, int));
-void	disk_reallymapin __P((struct buf *, struct pte *, int, int));
-vaddr_t	vax_map_physmem __P((paddr_t, int));
-void	vax_unmap_physmem __P((vaddr_t, int));
-void	ioaccess __P((vaddr_t, paddr_t, int));
-void	iounaccess __P((vaddr_t, int));
-void	findcpu __P((void));
+int	badaddr(caddr_t, int);
+void	cpu_swapin(struct proc *);
+int	hp_getdev(int, int, struct device **);
+int	sd_getdev(int, int, int, int, char **);
+int	ra_getdev(int, int, int, char **);
+int	bdevtomaj(int);
+void	dumpconf(void);
+void	dumpsys(void);
+void	swapconf(void);
+void	disk_printtype(int, int);
+void	disk_reallymapin(struct buf *, struct pte *, int, int);
+vaddr_t	vax_map_physmem(paddr_t, int);
+void	vax_unmap_physmem(vaddr_t, int);
+void	ioaccess(vaddr_t, paddr_t, int);
+void	iounaccess(vaddr_t, int);
+void	findcpu(void);
 #ifdef DDB
-int	kdbrint __P((int));
+int	kdbrint(int);
 #endif
 #endif /* _KERNEL */
 #endif /* _VAX_CPU_H_ */
diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index de9d48ce7a4..aec47bb74d5 100644
--- a/sys/arch/vax/include/db_machdep.h
+++ b/sys/arch/vax/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.8 2001/11/06 19:53:17 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.9 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $	*/
 
 /* 
@@ -73,7 +73,7 @@ db_regs_t	ddb_regs;	/* register state */
 #define inst_store(ins)		0
 
 /* Prototypes */
-void	kdb_trap __P((struct trapframe *));
+void	kdb_trap(struct trapframe *);
 
 /*
  * We use a.out symbols in DDB.
diff --git a/sys/arch/vax/include/ka820.h b/sys/arch/vax/include/ka820.h
index 3eaa3a73920..8498a3f673e 100644
--- a/sys/arch/vax/include/ka820.h
+++ b/sys/arch/vax/include/ka820.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka820.h,v 1.3 2000/04/26 03:08:41 bjc Exp $	*/
+/*	$OpenBSD: ka820.h,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: ka820.h,v 1.3 2000/01/24 02:40:32 matt Exp $	*/
 /*
  * Copyright (c) 1988 Regents of the University of California.
@@ -140,5 +140,5 @@ struct ka820clock {
 	u_short csr3;
 };
 
-void	crxintr __P((void *arg));
+void	crxintr(void *arg);
 #endif
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index d17c437903a..aeb2e365714 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macros.h,v 1.8 2000/04/26 03:08:41 bjc Exp $	*/
+/*	$OpenBSD: macros.h,v 1.9 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: macros.h,v 1.17 1998/11/07 17:22:58 ragge Exp $	*/
 
 /*
@@ -100,7 +100,7 @@ bcopy(const void *from, void *toe, u_int len)
 }
 #endif
 
-void	blkclr __P((void *, u_int));
+void	blkclr(void *, u_int);
 
 static __inline__ void *
 memset(void *block, int c, size_t len)
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 2cc57f257d8..ec5c128ed04 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.21 2001/12/05 01:57:15 provos Exp $ */
+/*	$OpenBSD: param.h,v 1.22 2002/03/14 01:26:48 millert Exp $ */
 /*      $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -213,7 +213,7 @@
 #ifndef	_LOCORE
 #include <machine/cpu.h>
 
-void	delay __P((int));
+void	delay(int);
 /* inline macros used inside kernel */
 #include <machine/macros.h>
 #endif
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index 50cbca23400..84b4a37ca3b 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.15 2001/12/04 23:22:42 art Exp $     */
+/*      $OpenBSD: pmap.h,v 1.16 2002/03/14 01:26:48 millert Exp $     */
 /*	$NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $	   */
 
 /* 
@@ -142,9 +142,9 @@ extern	struct pmap kernel_pmap_store;
 	    :: "r"(phys): "r0","r1","r2","r3","r4","r5");
 
 /* Prototypes */
-void	pmap_bootstrap __P((void));
-vaddr_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int));
-void	pmap_pinit __P((pmap_t));
+void	pmap_bootstrap(void);
+vaddr_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int);
+void	pmap_pinit(pmap_t);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h
index cdd956d5d31..5e90a6c1752 100644
--- a/sys/arch/vax/include/rpb.h
+++ b/sys/arch/vax/include/rpb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpb.h,v 1.7 2000/10/09 23:11:56 bjc Exp $ */
+/*	$OpenBSD: rpb.h,v 1.8 2002/03/14 01:26:48 millert Exp $ */
 /*	$NetBSD: rpb.h,v 1.6 1998/07/01 09:37:11 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -40,8 +40,7 @@
 
 struct rpb {		/* size		description */
 	struct rpb *rpb_base;	/* 4  physical base address of block */
-	void	(*rpb_restart)/* 4  physical address of restart routine */
-			__P((void));
+	void	(*rpb_restart)/* 4  physical address of restart routine */(void);
 	long	rpb_chksum;/* 4  checksum of first 31 longwords of restart */
 	long	rpb_rstflg;	/* 4  Restart in progress flag */
 	long	rpb_haltpc;	/* 4  PC at HALT/restart */
diff --git a/sys/arch/vax/include/sgmap.h b/sys/arch/vax/include/sgmap.h
index 43042d05a7b..52d1f68cd57 100644
--- a/sys/arch/vax/include/sgmap.h
+++ b/sys/arch/vax/include/sgmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgmap.h,v 1.4 2001/02/06 04:27:44 hugh Exp $	*/
+/*	$OpenBSD: sgmap.h,v 1.5 2002/03/14 01:26:48 millert Exp $	*/
 /* $NetBSD: sgmap.h,v 1.3 2000/05/17 21:22:18 matt Exp $ */
 
 /*-
@@ -63,26 +63,26 @@ struct vax_sgmap {
 	unsigned int aps_flags;		/* flags */
 };
 
-void	vax_sgmap_init __P((bus_dma_tag_t, struct vax_sgmap *,
-	    const char *, bus_addr_t, bus_size_t, struct pte *, bus_size_t));
+void	vax_sgmap_init(bus_dma_tag_t, struct vax_sgmap *,
+	    const char *, bus_addr_t, bus_size_t, struct pte *, bus_size_t);
 
-int	vax_sgmap_alloc __P((bus_dmamap_t, bus_size_t,
-	    struct vax_sgmap *, int));
-void	vax_sgmap_free __P((bus_dmamap_t, struct vax_sgmap *));
+int	vax_sgmap_alloc(bus_dmamap_t, bus_size_t,
+	    struct vax_sgmap *, int);
+void	vax_sgmap_free(bus_dmamap_t, struct vax_sgmap *);
 
-int     vax_sgmap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, 
-	    bus_size_t, struct proc *, int, struct vax_sgmap *));
+int     vax_sgmap_load(bus_dma_tag_t, bus_dmamap_t, void *, 
+	    bus_size_t, struct proc *, int, struct vax_sgmap *);
 
-int	vax_sgmap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int, struct vax_sgmap *));
+int	vax_sgmap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int, struct vax_sgmap *);
    
-int     vax_sgmap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int, struct vax_sgmap *));
+int     vax_sgmap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int, struct vax_sgmap *);
          
-int	vax_sgmap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int, struct vax_sgmap *));
+int	vax_sgmap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int, struct vax_sgmap *);
 
-void	vax_sgmap_unload __P(( bus_dma_tag_t, bus_dmamap_t, 
-	    struct vax_sgmap *));
+void	vax_sgmap_unload( bus_dma_tag_t, bus_dmamap_t, 
+	    struct vax_sgmap *);
 
 #endif	/* _VAX_COMMON_SGMAPVAR_H */
diff --git a/sys/arch/vax/include/vsbus.h b/sys/arch/vax/include/vsbus.h
index 2b99b7d7758..91d58a21ca1 100644
--- a/sys/arch/vax/include/vsbus.h
+++ b/sys/arch/vax/include/vsbus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbus.h,v 1.6 2001/08/25 13:33:36 hugh Exp $ */
+/*	$OpenBSD: vsbus.h,v 1.7 2002/03/14 01:26:48 millert Exp $ */
 /*	$NetBSD: vsbus.h,v 1.13 2000/06/25 16:00:46 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -88,7 +88,7 @@ struct	vsbus_attach_args {
 	vaddr_t	va_addr;		/* virtual CSR address */
 	paddr_t	va_paddr;		/* physical CSR address */
 
-	void	(*va_ivec) __P((void *));	/* Interrupt routine */
+	void	(*va_ivec)(void *);	/* Interrupt routine */
 	void	*va_vecarg;		/* Interrupt routine argument */
 
 	short	va_br;			/* Interrupt level */