diff --git a/sys/arch/atari/atari/atari_init.c b/sys/arch/atari/atari/atari_init.c
index f27e06b7b0ad..f50607388024 100644
--- a/sys/arch/atari/atari/atari_init.c
+++ b/sys/arch/atari/atari/atari_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari_init.c,v 1.73 2009/01/17 07:17:35 tsutsui Exp $	*/
+/*	$NetBSD: atari_init.c,v 1.74 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.73 2009/01/17 07:17:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.74 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
@@ -78,18 +78,16 @@ __KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.73 2009/01/17 07:17:35 tsutsui Exp
 
 #include "pci.h"
 
-void start_c __P((int, u_int, u_int, u_int, char *));
-static void atari_hwinit __P((void));
-static void cpu_init_kcorehdr __P((paddr_t, paddr_t));
-static void initcpu __P((void));
-static void mmu030_setup __P((paddr_t, u_int, paddr_t, psize_t, paddr_t,
-			      paddr_t));
-static void map_io_areas __P((paddr_t, psize_t, u_int));
-static void set_machtype __P((void));
+void start_c(int, u_int, u_int, u_int, char *);
+static void atari_hwinit(void);
+static void cpu_init_kcorehdr(paddr_t, paddr_t);
+static void initcpu(void);
+static void mmu030_setup(paddr_t, u_int, paddr_t, psize_t, paddr_t, paddr_t);
+static void map_io_areas(paddr_t, psize_t, u_int);
+static void set_machtype(void);
 
 #if defined(M68040) || defined(M68060)
-static void mmu040_setup __P((paddr_t, u_int, paddr_t, psize_t, paddr_t,
-			      paddr_t));
+static void mmu040_setup(paddr_t, u_int, paddr_t, psize_t, paddr_t, paddr_t);
 #endif
 
 /*
@@ -183,7 +181,7 @@ u_int	stphysize;		/* Size of ST-ram	 		*/
 char	*esym_addr;		/* Address of kernel '_esym' symbol	*/
 {
 	extern char	end[];
-	extern void	etext __P((void));
+	extern void	etext(void);
 	extern u_long	protorp[2];
 	paddr_t		pstart;		/* Next available physical address */
 	vaddr_t		vstart;		/* Next available virtual address */
@@ -725,7 +723,7 @@ map_io_areas(ptpa, ptsize, ptextra)
 	psize_t		ptsize;		/* Size of 'pt' in bytes	*/
 	u_int		ptextra;	/* #of additional I/O pte's	*/
 {
-	extern void	bootm_init __P((vaddr_t, pt_entry_t *, u_long));
+	extern void	bootm_init(vaddr_t, pt_entry_t *, u_long);
 	vaddr_t		ioaddr;
 	pt_entry_t	*pt, *pg, *epg;
 	pt_entry_t	pg_proto;
@@ -1082,7 +1080,7 @@ int m68060_pcr_init = 0x21;	/* make this patchable */
 static void
 initcpu()
 {
-	typedef void trapfun __P((void));
+	typedef void trapfun(void);
 
 	switch (cputype) {
 
@@ -1162,9 +1160,9 @@ initcpu()
 }
 
 #ifdef DEBUG
-void dump_segtable __P((u_int *));
-void dump_pagetable __P((u_int *, u_int, u_int));
-u_int vmtophys __P((u_int *, u_int));
+void dump_segtable(u_int *);
+void dump_pagetable(u_int *, u_int, u_int);
+u_int vmtophys(u_int *, u_int);
 
 void
 dump_segtable(stp)
diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c
index 444468ccc806..014b963380ea 100644
--- a/sys/arch/atari/atari/autoconf.c
+++ b/sys/arch/atari/atari/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.54 2007/12/03 15:33:21 ad Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.55 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.54 2007/12/03 15:33:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.55 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,10 +45,10 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.54 2007/12/03 15:33:21 ad Exp $");
 #include <machine/cpu.h>
 #include <atari/atari/device.h>
 
-static void findroot __P((void));
-void mbattach __P((struct device *, struct device *, void *));
-int mbprint __P((void *, const char *));
-int mbmatch __P((struct device *, struct cfdata *, void *));
+static void findroot(void);
+void mbattach(struct device *, struct device *, void *);
+int mbprint(void *, const char *);
+int mbmatch(struct device *, struct cfdata *, void *);
 
 int atari_realconfig;
 #include <sys/kernel.h>
diff --git a/sys/arch/atari/atari/be_bus.c b/sys/arch/atari/atari/be_bus.c
index bdace9d99986..c9083f0b69f1 100644
--- a/sys/arch/atari/atari/be_bus.c
+++ b/sys/arch/atari/atari/be_bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: be_bus.c,v 1.10 2008/12/27 16:14:12 tsutsui Exp $	*/
+/*	$NetBSD: be_bus.c,v 1.11 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.10 2008/12/27 16:14:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.11 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -45,118 +45,118 @@ __KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.10 2008/12/27 16:14:12 tsutsui Exp $");
  */
 
 	/* Autoconf detection stuff */
-static int		beb_bus_space_peek_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		beb_bus_space_peek_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		beb_bus_space_peek_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		beb_bus_space_peek_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
+static int		beb_bus_space_peek_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		beb_bus_space_peek_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		beb_bus_space_peek_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		beb_bus_space_peek_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
 
 	/* read (single) */
-static u_int8_t		beb_bus_space_read_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int16_t	beb_bus_space_read_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int32_t	beb_bus_space_read_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int64_t	beb_bus_space_read_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
+static u_int8_t		beb_bus_space_read_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int16_t	beb_bus_space_read_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int32_t	beb_bus_space_read_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int64_t	beb_bus_space_read_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
 
 	/* write (single) */
-static void		beb_bus_space_write_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int8_t));
-static void		beb_bus_space_write_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int16_t));
-static void		beb_bus_space_write_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int32_t));
-static void		beb_bus_space_write_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int64_t));
+static void		beb_bus_space_write_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int8_t);
+static void		beb_bus_space_write_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int16_t);
+static void		beb_bus_space_write_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int32_t);
+static void		beb_bus_space_write_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int64_t);
 
 	/* read multiple */
-static void		beb_bus_space_read_multi_1 __P((bus_space_tag_t,
+static void		beb_bus_space_read_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		beb_bus_space_read_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		beb_bus_space_read_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		beb_bus_space_read_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
+				bus_size_t);
 
 	/* write multiple */
-static void		beb_bus_space_write_multi_1 __P((bus_space_tag_t,
+static void		beb_bus_space_write_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		beb_bus_space_write_multi_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		beb_bus_space_write_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		beb_bus_space_write_multi_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		beb_bus_space_write_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		beb_bus_space_write_multi_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		beb_bus_space_write_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
+				const u_int64_t *, bus_size_t);
 
 	/* read region */
-static void		beb_bus_space_read_region_1 __P((bus_space_tag_t,
+static void		beb_bus_space_read_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		beb_bus_space_read_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		beb_bus_space_read_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		beb_bus_space_read_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_read_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
+				bus_size_t);
 
 	/* read region */
-static void		beb_bus_space_write_region_1 __P((bus_space_tag_t,
+static void		beb_bus_space_write_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		beb_bus_space_write_region_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		beb_bus_space_write_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		beb_bus_space_write_region_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		beb_bus_space_write_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		beb_bus_space_write_region_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		beb_bus_space_write_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
+				const u_int64_t *, bus_size_t);
 
 	/* set multi */
-static void		beb_bus_space_set_multi_1 __P((bus_space_tag_t,
+static void		beb_bus_space_set_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		beb_bus_space_set_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		beb_bus_space_set_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		beb_bus_space_set_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
+				bus_size_t);
 
 	/* set region */
-static void		beb_bus_space_set_region_1 __P((bus_space_tag_t,
+static void		beb_bus_space_set_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		beb_bus_space_set_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		beb_bus_space_set_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		beb_bus_space_set_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		beb_bus_space_set_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
+				bus_size_t);
 
 /*
  * Don't force a function call overhead on these primitives...
@@ -259,8 +259,8 @@ bus_space_tag_t	storage;
  */
 
 /*
- *	int bus_space_peek_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t sh, bus_size_t offset));
+ *	int bus_space_peek_N(bus_space_tag_t tag,
+ *		bus_space_handle_t sh, bus_size_t offset);
  *
  * Check if the address is suitable for reading N-byte quantities.
  */
@@ -301,8 +301,8 @@ beb_bus_space_peek_8(t, h, o)
 }
 
 /*
- *	u_intX_t bus_space_read_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset));
+ *	u_intX_t bus_space_read_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset);
  *
  * Return an 1, 2, 4, or 8 byte value read from the bus_space described
  * by tag/handle at `offset'. The value is converted to host-endian.
@@ -344,8 +344,8 @@ beb_bus_space_read_8(t, h, o)
 }
 
 /*
- *	u_intX_t bus_space_write_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val));
+ *	u_intX_t bus_space_write_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val);
  *
  * Write an 1, 2, 4, or 8 byte value to the bus_space described by tag/handle
  * at `offset'. The value `val' is converted from host to bus endianness
@@ -392,9 +392,9 @@ beb_bus_space_write_8(t, h, o, v)
 }
 
 /*
- *	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_intX_t *address,
- *	 	bus_size_t count));
+ *	 	bus_size_t count);
  *
  * Read 'count' 1, 2, 4, or 8 byte values from the bus_space described by
  * tag/handle at `offset' and store them in the address range starting at
@@ -445,9 +445,9 @@ beb_bus_space_read_multi_8(t, h, o, a, c)
 }
 
 /*
- *	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_intX_t *address, bus_size_t count));
+ *		const u_intX_t *address, bus_size_t count);
  *
  * Write 'count' 1, 2, 4, or 8 byte values from the address range starting
  * at 'address' to the bus_space described by tag/handle at `offset'.
@@ -499,9 +499,9 @@ beb_bus_space_write_multi_8(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, bus_size_t count));
+ *		u_intN_t *addr, bus_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
@@ -552,9 +552,9 @@ beb_bus_space_read_region_8(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,
- *		u_intN_t *addr, bus_size_t count));
+ *		u_intN_t *addr, bus_size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * into the bus space described by tag/handle and starting at `offset'.
@@ -604,9 +604,9 @@ beb_bus_space_write_region_8(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,
- *		bus_size_t count));
+ *		bus_size_t count);
  *
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
@@ -657,9 +657,9 @@ beb_bus_space_set_multi_8(t, h, o, v, c)
 }
 
 /*
- *	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,
- *		bus_size_t count));
+ *		bus_size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle starting at `offset'.
diff --git a/sys/arch/atari/atari/bus.c b/sys/arch/atari/atari/bus.c
index 8b4df2d3a469..7038ac4780a6 100644
--- a/sys/arch/atari/atari/bus.c
+++ b/sys/arch/atari/atari/bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.c,v 1.47 2008/06/04 12:41:40 ad Exp $	*/
+/*	$NetBSD: bus.c,v 1.48 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.47 2008/06/04 12:41:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.48 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,15 +47,15 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.47 2008/06/04 12:41:40 ad Exp $");
 #define	_ATARI_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
-int  bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+int  bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 		bus_size_t alignment, bus_size_t boundary,
 		bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
-		paddr_t low, paddr_t high));
-static int  _bus_dmamap_load_buffer __P((bus_dma_tag_t tag, bus_dmamap_t,
+		paddr_t low, paddr_t high);
+static int  _bus_dmamap_load_buffer(bus_dma_tag_t tag, bus_dmamap_t,
 		void *, bus_size_t, struct vmspace *, int, paddr_t *,
-		int *, int));
-static int  bus_mem_add_mapping __P((bus_space_tag_t t, bus_addr_t bpa,
-		bus_size_t size, int flags, bus_space_handle_t *bsph));
+		int *, int);
+static int  bus_mem_add_mapping(bus_space_tag_t t, bus_addr_t bpa,
+		bus_size_t size, int flags, bus_space_handle_t *bsph);
 
 extern struct extent *iomem_ex;
 extern int iomem_malloc_safe;
diff --git a/sys/arch/atari/atari/device.h b/sys/arch/atari/atari/device.h
index bad7b16d137c..eb64fa7e6dcc 100644
--- a/sys/arch/atari/atari/device.h
+++ b/sys/arch/atari/atari/device.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: device.h,v 1.3 2008/06/11 14:35:53 tsutsui Exp $	*/
+/*	$NetBSD: device.h,v 1.4 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -39,10 +39,9 @@
  * *and know it* (i.e. everything is really tight certain params won't be 
  * passed in some cases and the devices will deal with it)
  */
-int atari_config_found __P((struct cfdata *, struct device *,
-    void *, cfprint_t ));
-int simple_devprint __P((void *, const char *));
-int matchname __P((char *, char *));
+int atari_config_found(struct cfdata *, struct device *, void *, cfprint_t);
+int simple_devprint(void *, const char *);
+int matchname(char *, char *);
 /*
  * false when initing for the console.
  */
diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c
index 29f415674108..7cbd7ee36576 100644
--- a/sys/arch/atari/atari/disksubr.c
+++ b/sys/arch/atari/atari/disksubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: disksubr.c,v 1.35 2008/01/02 11:48:23 ad Exp $	*/
+/*	$NetBSD: disksubr.c,v 1.36 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.35 2008/01/02 11:48:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.36 2009/03/05 13:21:44 tsutsui Exp $");
 
 #ifndef DISKLABEL_NBDA
 #define	DISKLABEL_NBDA	/* required */
@@ -56,14 +56,14 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.35 2008/01/02 11:48:23 ad Exp $");
 #error BBSIZE smaller than BBMINSIZE
 #endif
 
-static void  ck_label __P((struct disklabel *, struct cpu_disklabel *));
-static int   bsd_label __P((dev_t, void (*)(struct buf *),
-			struct disklabel *, u_int, u_int *));
-static int   ahdi_label __P((dev_t, void (*)(struct buf *),
-			struct disklabel *, struct cpu_disklabel *));
-static void  ahdi_to_bsd __P((struct disklabel *, struct ahdi_ptbl *));
-static u_int ahdi_getparts __P((dev_t, void (*)(struct buf *), u_int,
-					u_int, u_int, struct ahdi_ptbl *));
+static void  ck_label(struct disklabel *, struct cpu_disklabel *);
+static int   bsd_label(dev_t, void (*)(struct buf *),
+			struct disklabel *, u_int, u_int *);
+static int   ahdi_label(dev_t, void (*)(struct buf *),
+			struct disklabel *, struct cpu_disklabel *);
+static void  ahdi_to_bsd(struct disklabel *, struct ahdi_ptbl *);
+static u_int ahdi_getparts(dev_t, void (*)(struct buf *), u_int,
+					u_int, u_int, struct ahdi_ptbl *);
 
 /*
  * Attempt to read a disk label from a device using the
diff --git a/sys/arch/atari/atari/dkbad.c b/sys/arch/atari/atari/dkbad.c
index 57f36204031c..13a2481876d1 100644
--- a/sys/arch/atari/atari/dkbad.c
+++ b/sys/arch/atari/atari/dkbad.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkbad.c,v 1.6 2005/12/11 12:16:54 christos Exp $	*/
+/*	$NetBSD: dkbad.c,v 1.7 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -32,14 +32,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.6 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkbad.c,v 1.7 2009/03/05 13:21:44 tsutsui Exp $");
 
 #ifndef NOBADSECT
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/dkbad.h>
 
-int isbad __P((struct dkbad *, int, int, int));
+int isbad(struct dkbad *, int, int, int);
 
 /*
  * Search the bad sector table looking for
diff --git a/sys/arch/atari/atari/intr.h b/sys/arch/atari/atari/intr.h
index ea805dc6158f..283175d9404a 100644
--- a/sys/arch/atari/atari/intr.h
+++ b/sys/arch/atari/atari/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.4 2008/04/28 20:23:14 martin Exp $	*/
+/*	$NetBSD: intr.h,v 1.5 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  * the list.  The handler is called with its (single) argument or with a
  * 'standard' clockframe. This depends on 'ih_type'.
  */
-typedef int	(*hw_ifun_t) __P((void *, int));
+typedef int	(*hw_ifun_t)(void *, int);
 
 struct intrhand {
 	LIST_ENTRY(intrhand)	ih_link;
@@ -56,11 +56,11 @@ struct intrhand {
 	u_long			*ih_intrcnt;
 };
 
-void		intr_init __P((void));
-struct intrhand *intr_establish __P((int, int, int, hw_ifun_t, void *));
-int		intr_disestablish __P((struct intrhand *));
-void		intr_dispatch __P((struct clockframe));
-void		intr_glue __P((void));
+void		intr_init(void);
+struct intrhand *intr_establish(int, int, int, hw_ifun_t, void *);
+int		intr_disestablish(struct intrhand *);
+void		intr_dispatch(struct clockframe);
+void		intr_glue(void);
 
 /*
  * Exported by intrcnt.h
diff --git a/sys/arch/atari/atari/le_bus.c b/sys/arch/atari/atari/le_bus.c
index ede7611c66eb..fcd756be9ff1 100644
--- a/sys/arch/atari/atari/le_bus.c
+++ b/sys/arch/atari/atari/le_bus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: le_bus.c,v 1.14 2008/12/27 16:14:12 tsutsui Exp $	*/
+/*	$NetBSD: le_bus.c,v 1.15 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.14 2008/12/27 16:14:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.15 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,185 +46,185 @@ __KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.14 2008/12/27 16:14:12 tsutsui Exp $");
  */
 
 	/* Autoconf detection stuff */
-static int		leb_bus_space_peek_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		leb_bus_space_peek_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		leb_bus_space_peek_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		leb_bus_space_peek_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
+static int		leb_bus_space_peek_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		leb_bus_space_peek_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		leb_bus_space_peek_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		leb_bus_space_peek_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
 
 	/* read (single) */
-static u_int8_t		leb_bus_space_read_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int16_t	leb_bus_space_read_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int32_t	leb_bus_space_read_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int64_t	leb_bus_space_read_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
+static u_int8_t		leb_bus_space_read_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int16_t	leb_bus_space_read_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int32_t	leb_bus_space_read_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int64_t	leb_bus_space_read_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
 
 	/* write (single) */
-static void		leb_bus_space_write_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int8_t));
-static void		leb_bus_space_write_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int16_t));
-static void		leb_bus_space_write_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int32_t));
-static void		leb_bus_space_write_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int64_t));
+static void		leb_bus_space_write_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int8_t);
+static void		leb_bus_space_write_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int16_t);
+static void		leb_bus_space_write_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int32_t);
+static void		leb_bus_space_write_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int64_t);
 
 	/* read (single) stream */
-static u_int16_t	leb_bus_space_read_stream_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int32_t	leb_bus_space_read_stream_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int64_t	leb_bus_space_read_stream_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
+static u_int16_t	leb_bus_space_read_stream_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int32_t	leb_bus_space_read_stream_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int64_t	leb_bus_space_read_stream_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
 
 	/* write (single) stream */
-static void		leb_bus_space_write_stream_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int16_t));
-static void		leb_bus_space_write_stream_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int32_t));
-static void		leb_bus_space_write_stream_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int64_t));
+static void		leb_bus_space_write_stream_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int16_t);
+static void		leb_bus_space_write_stream_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int32_t);
+static void		leb_bus_space_write_stream_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int64_t);
 
 	/* read multiple */
-static void		leb_bus_space_read_multi_1 __P((bus_space_tag_t,
+static void		leb_bus_space_read_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		leb_bus_space_read_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		leb_bus_space_read_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		leb_bus_space_read_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
+				bus_size_t);
 
 	/* write multiple */
-static void		leb_bus_space_write_multi_1 __P((bus_space_tag_t,
+static void		leb_bus_space_write_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		leb_bus_space_write_multi_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		leb_bus_space_write_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		leb_bus_space_write_multi_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		leb_bus_space_write_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		leb_bus_space_write_multi_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		leb_bus_space_write_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
+				const u_int64_t *, bus_size_t);
 
 	/* read multiple stream */
-static void		leb_bus_space_read_multi_stream_2 __P((bus_space_tag_t,
+static void		leb_bus_space_read_multi_stream_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		leb_bus_space_read_multi_stream_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_multi_stream_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		leb_bus_space_read_multi_stream_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_multi_stream_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
+				bus_size_t);
 
 	/* write multiple stream */
-static void		leb_bus_space_write_multi_stream_2 __P((bus_space_tag_t,
+static void		leb_bus_space_write_multi_stream_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		leb_bus_space_write_multi_stream_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		leb_bus_space_write_multi_stream_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		leb_bus_space_write_multi_stream_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		leb_bus_space_write_multi_stream_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
+				const u_int64_t *, bus_size_t);
 
 	/* read region */
-static void		leb_bus_space_read_region_1 __P((bus_space_tag_t,
+static void		leb_bus_space_read_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		leb_bus_space_read_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		leb_bus_space_read_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		leb_bus_space_read_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_read_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
+				bus_size_t);
 
 	/* write region */
-static void		leb_bus_space_write_region_1 __P((bus_space_tag_t,
+static void		leb_bus_space_write_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		leb_bus_space_write_region_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		leb_bus_space_write_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		leb_bus_space_write_region_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		leb_bus_space_write_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		leb_bus_space_write_region_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		leb_bus_space_write_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
+				const u_int64_t *, bus_size_t);
 
 	/* read region stream */
-static void		leb_bus_space_read_region_stream_2 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, u_int16_t *, bus_size_t));
-static void		leb_bus_space_read_region_stream_4 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, u_int32_t *, bus_size_t));
-static void		leb_bus_space_read_region_stream_8 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, u_int64_t *, bus_size_t));
+static void		leb_bus_space_read_region_stream_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int16_t *,
+				bus_size_t);
+static void		leb_bus_space_read_region_stream_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int32_t *,
+				bus_size_t);
+static void		leb_bus_space_read_region_stream_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int64_t *,
+				bus_size_t);
 
 	/* write region */
-static void		leb_bus_space_write_region_stream_2 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, const u_int16_t *, bus_size_t));
-static void		leb_bus_space_write_region_stream_4 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, const u_int32_t *, bus_size_t));
-static void		leb_bus_space_write_region_stream_8 __P((
-				bus_space_tag_t, bus_space_handle_t,
-				bus_size_t, const u_int64_t *, bus_size_t));
+static void		leb_bus_space_write_region_stream_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t,
+				const u_int16_t *, bus_size_t);
+static void		leb_bus_space_write_region_stream_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t,
+				const u_int32_t *, bus_size_t);
+static void		leb_bus_space_write_region_stream_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t,
+				const u_int64_t *, bus_size_t);
 
 	/* set multi */
-static void		leb_bus_space_set_multi_1 __P((bus_space_tag_t,
+static void		leb_bus_space_set_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		leb_bus_space_set_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		leb_bus_space_set_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		leb_bus_space_set_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
+				bus_size_t);
 
 	/* set region */
-static void		leb_bus_space_set_region_1 __P((bus_space_tag_t,
+static void		leb_bus_space_set_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		leb_bus_space_set_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		leb_bus_space_set_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		leb_bus_space_set_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		leb_bus_space_set_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
+				bus_size_t);
 
 /*
  * Define these inline, to avoid function call overhead.
  * XXX: Maybe move to an m68k include file?
  */
-static u_int16_t swap16 __P((u_int16_t v));
-static u_int32_t swap32 __P((u_int32_t v));
+static u_int16_t swap16(u_int16_t v);
+static u_int32_t swap32(u_int32_t v);
 
 static inline u_int16_t swap16(u_int16_t v)
 {
@@ -341,8 +341,8 @@ bus_space_tag_t	storage;
  */
 
 /*
- *	int bus_space_peek_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t sh, bus_size_t offset));
+ *	int bus_space_peek_N(bus_space_tag_t tag,
+ *		bus_space_handle_t sh, bus_size_t offset);
  *
  * Check if the address is suitable for reading N-byte quantities.
  */
@@ -383,8 +383,8 @@ leb_bus_space_peek_8(t, h, o)
 }
 
 /*
- *	u_intX_t bus_space_read_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset));
+ *	u_intX_t bus_space_read_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset);
  *
  * Return an 1, 2, 4, or 8 byte value read from the bus_space described
  * by tag/handle at `offset'. The value is converted to host-endian.
@@ -426,8 +426,8 @@ leb_bus_space_read_8(t, h, o)
 }
 
 /*
- *	u_intX_t bus_space_write_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val));
+ *	u_intX_t bus_space_write_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val);
  *
  * Write an 1, 2, 4, or 8 byte value to the bus_space described by tag/handle
  * at `offset'. The value `val' is converted from host to bus endianness
@@ -474,8 +474,8 @@ leb_bus_space_write_8(t, h, o, v)
 }
 
 /*
- *	u_intX_t bus_space_read_stream_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset));
+ *	u_intX_t bus_space_read_stream_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset);
  *
  * Return an 1, 2, 4, or 8 byte value read from the bus_space described
  * by tag/handle at `offset'. No endian conversion is done.
@@ -508,8 +508,8 @@ leb_bus_space_read_stream_8(t, h, o)
 }
 
 /*
- *	u_intX_t bus_space_write_stream_N __P((bus_space_tag_t tag,
- *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val));
+ *	u_intX_t bus_space_write_stream_N(bus_space_tag_t tag,
+ *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val);
  *
  * Write an 1, 2, 4, or 8 byte value to the bus_space described by tag/handle
  * at `offset'. No endian conversion is done.
@@ -545,9 +545,9 @@ leb_bus_space_write_stream_8(t, h, o, v)
 }
 
 /*
- *	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_intX_t *address,
- *	 	bus_size_t count));
+ *	 	bus_size_t count);
  *
  * Read 'count' 1, 2, 4, or 8 byte values from the bus_space described by
  * tag/handle at `offset' and store them in the address range starting at
@@ -598,9 +598,9 @@ leb_bus_space_read_multi_8(t, h, o, a, c)
 }
 
 /*
- *	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_intX_t *address, bus_size_t count));
+ *		const u_intX_t *address, bus_size_t count);
  *
  * Write 'count' 1, 2, 4, or 8 byte values from the address range starting
  * at 'address' to the bus_space described by tag/handle at `offset'.
@@ -652,9 +652,9 @@ leb_bus_space_write_multi_8(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_read_multi_stream_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_multi_stream_N(bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t *address,
- *	 	bus_size_t count));
+ *	 	bus_size_t count);
  *
  * Read 'count' 1, 2, 4, or 8 byte values from the bus_space described by
  * tag/handle at `offset' and store them in the address range starting at
@@ -694,9 +694,9 @@ leb_bus_space_read_multi_stream_8(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_write_multi_stream_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_multi_stream_N(bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
- *		const u_intX_t *address, bus_size_t count));
+ *		const u_intX_t *address, bus_size_t count);
  *
  * Write 'count' 1, 2, 4, or 8 byte values from the address range starting
  * at 'address' to the bus_space described by tag/handle at `offset'.
@@ -736,9 +736,9 @@ leb_bus_space_write_multi_stream_8(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, bus_size_t count));
+ *		u_intN_t *addr, bus_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
@@ -789,9 +789,9 @@ leb_bus_space_read_region_8(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,
- *		u_intN_t *addr, bus_size_t count));
+ *		u_intN_t *addr, bus_size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * into the bus space described by tag/handle and starting at `offset'.
@@ -841,9 +841,9 @@ leb_bus_space_write_region_8(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_read_region_stream_N __P((bus_space_tag_t tag,
+ *	void bus_space_read_region_stream_N(bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
- *		u_intN_t *addr, bus_size_t count));
+ *		u_intN_t *addr, bus_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
@@ -884,9 +884,9 @@ leb_bus_space_read_region_stream_8(t, h, o, a, c)
 }
 
 /*
- *	void bus_space_write_region_stream_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_region_stream_N(bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
- *		u_intN_t *addr, bus_size_t count));
+ *		u_intN_t *addr, bus_size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * into the bus space described by tag/handle and starting at `offset'.
@@ -926,9 +926,9 @@ leb_bus_space_write_region_stream_8(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,
- *		bus_size_t count));
+ *		bus_size_t count);
  *
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
@@ -982,9 +982,9 @@ leb_bus_space_set_multi_8(t, h, o, v, c)
 }
 
 /*
- *	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,
- *		bus_size_t count));
+ *		bus_size_t count);
  *
  * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle starting at `offset'.
diff --git a/sys/arch/atari/atari/mainbus.c b/sys/arch/atari/atari/mainbus.c
index a80992dfae65..c8ee1ac2043e 100644
--- a/sys/arch/atari/atari/mainbus.c
+++ b/sys/arch/atari/atari/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.8 2008/12/27 16:14:12 tsutsui Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.9 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2008/12/27 16:14:12 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -39,102 +39,102 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2008/12/27 16:14:12 tsutsui Exp $");
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
-static int		mb_bus_space_peek_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		mb_bus_space_peek_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		mb_bus_space_peek_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static int		mb_bus_space_peek_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int8_t		mb_bus_space_read_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int16_t	mb_bus_space_read_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int32_t	mb_bus_space_read_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static u_int64_t	mb_bus_space_read_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t));
-static void		mb_bus_space_write_1 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int8_t));
-static void		mb_bus_space_write_2 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int16_t));
-static void		mb_bus_space_write_4 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int32_t));
-static void		mb_bus_space_write_8 __P((bus_space_tag_t,
-				bus_space_handle_t, bus_size_t, u_int64_t));
-static void		mb_bus_space_read_multi_1 __P((bus_space_tag_t,
+static int		mb_bus_space_peek_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		mb_bus_space_peek_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		mb_bus_space_peek_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static int		mb_bus_space_peek_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int8_t		mb_bus_space_read_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int16_t	mb_bus_space_read_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int32_t	mb_bus_space_read_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static u_int64_t	mb_bus_space_read_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t);
+static void		mb_bus_space_write_1(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int8_t);
+static void		mb_bus_space_write_2(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int16_t);
+static void		mb_bus_space_write_4(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int32_t);
+static void		mb_bus_space_write_8(bus_space_tag_t,
+				bus_space_handle_t, bus_size_t, u_int64_t);
+static void		mb_bus_space_read_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		mb_bus_space_read_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		mb_bus_space_read_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		mb_bus_space_read_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
-static void		mb_bus_space_write_multi_1 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_write_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		mb_bus_space_write_multi_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		mb_bus_space_write_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		mb_bus_space_write_multi_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		mb_bus_space_write_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		mb_bus_space_write_multi_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		mb_bus_space_write_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
-static void		mb_bus_space_read_region_1 __P((bus_space_tag_t,
+				const u_int64_t *, bus_size_t);
+static void		mb_bus_space_read_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t *,
-				bus_size_t));
-static void		mb_bus_space_read_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t *,
-				bus_size_t));
-static void		mb_bus_space_read_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t *,
-				bus_size_t));
-static void		mb_bus_space_read_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_read_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t *,
-				bus_size_t));
-static void		mb_bus_space_write_region_1 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_write_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int8_t *, bus_size_t));
-static void		mb_bus_space_write_region_2 __P((bus_space_tag_t,
+				const u_int8_t *, bus_size_t);
+static void		mb_bus_space_write_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int16_t *, bus_size_t));
-static void		mb_bus_space_write_region_4 __P((bus_space_tag_t,
+				const u_int16_t *, bus_size_t);
+static void		mb_bus_space_write_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int32_t *, bus_size_t));
-static void		mb_bus_space_write_region_8 __P((bus_space_tag_t,
+				const u_int32_t *, bus_size_t);
+static void		mb_bus_space_write_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t,
-				const u_int64_t *, bus_size_t));
-static void		mb_bus_space_set_multi_1 __P((bus_space_tag_t,
+				const u_int64_t *, bus_size_t);
+static void		mb_bus_space_set_multi_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		mb_bus_space_set_multi_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_multi_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		mb_bus_space_set_multi_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_multi_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		mb_bus_space_set_multi_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_multi_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
-static void		mb_bus_space_set_region_1 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_region_1(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int8_t,
-				bus_size_t));
-static void		mb_bus_space_set_region_2 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_region_2(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
-				bus_size_t));
-static void		mb_bus_space_set_region_4 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_region_4(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
-				bus_size_t));
-static void		mb_bus_space_set_region_8 __P((bus_space_tag_t,
+				bus_size_t);
+static void		mb_bus_space_set_region_8(bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
-				bus_size_t));
+				bus_size_t);
 /*
  * Calculate offset on the mainbus given a stride_shift and width_offset
  */
@@ -470,9 +470,9 @@ mb_bus_space_write_multi_8(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
@@ -523,9 +523,9 @@ mb_bus_space_read_region_8(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,
- *		u_intN_t *addr, size_t count));
+ *		u_intN_t *addr, size_t count);
  *
  * Copy `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * into the bus space described by tag/handle and starting at `offset'.
@@ -575,9 +575,9 @@ mb_bus_space_write_region_8(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.
@@ -640,9 +640,9 @@ mb_bus_space_set_multi_8(t, h, o, v, c)
 }
 
 /*
- *	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'.
diff --git a/sys/arch/atari/atari/stalloc.h b/sys/arch/atari/atari/stalloc.h
index 654927c4ff3a..6ad45e45c720 100644
--- a/sys/arch/atari/atari/stalloc.h
+++ b/sys/arch/atari/atari/stalloc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stalloc.h,v 1.3 1996/04/12 09:05:17 leo Exp $	*/
+/*	$NetBSD: stalloc.h,v 1.4 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1994 Christian E. Hopps (allocator stuff)
@@ -48,8 +48,8 @@ struct mem_node {
 #define ST_BLOCKMASK	(~(ST_BLOCKSIZE - 1))
 #define MNODES_MEM(mn)	((u_char *)(&mn[1]))
 
-void init_stmem __P((void));
-void *alloc_stmem __P((u_long, void **));
-void free_stmem __P((void *));
+void init_stmem(void);
+void *alloc_stmem(u_long, void **);
+void free_stmem(void *);
 
 #endif /* _ATARI_STALLOC_H */
diff --git a/sys/arch/atari/atari/trap.c b/sys/arch/atari/atari/trap.c
index 57e4799e1edf..a606088d3bad 100644
--- a/sys/arch/atari/atari/trap.c
+++ b/sys/arch/atari/atari/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.99 2009/01/27 20:30:13 martin Exp $	*/
+/*	$NetBSD: trap.c,v 1.100 2009/03/05 13:21:44 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.99 2009/01/27 20:30:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.100 2009/03/05 13:21:44 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -127,13 +127,13 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.99 2009/01/27 20:30:13 martin Exp $");
 extern struct emul emul_sunos;
 #endif
 
-void trap __P((struct frame *, int, u_int, u_int));
+void trap(struct frame *, int, u_int, u_int);
 
-static void panictrap __P((int, u_int, u_int, struct frame *));
-static void trapcpfault __P((struct lwp *, struct frame *));
-static void userret __P((struct lwp *, struct frame *fp, u_quad_t, u_int,int));
+static void panictrap(int, u_int, u_int, struct frame *);
+static void trapcpfault(struct lwp *, struct frame *);
+static void userret(struct lwp *, struct frame *fp, u_quad_t, u_int, int);
 #ifdef M68040
-static int  writeback __P((struct frame *, int));
+static int  writeback(struct frame *, int);
 #endif /* M68040 */
 
 const char *trap_type[] = {
@@ -749,8 +749,8 @@ const char *f7tm[] = { "d-push", "u-data", "u-code", "M-data",
 const char wberrstr[] =
     "WARNING: pid %d(%s) writeback [%s] failed, pc=%x fa=%x wba=%x wbd=%x\n";
 
-static void dumpwb __P((int, u_short, u_int, u_int));
-static void dumpssw __P((u_short));
+static void dumpwb(int, u_short, u_int, u_int);
+static void dumpssw(u_short);
 #endif /* DEBUG */
 
 static int