Final __P removal plus some cosmetic fixups

16 files changed, 47 insertions, 47 deletions

diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index eb25d2c239a..e045523b73a 100644
--- a/sys/arch/macppc/dev/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb_direct.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: adb_direct.c,v 1.4 2002/03/14 03:15:55 millert Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
 /* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -1007,7 +1007,7 @@ adb_soft_intr(void)
 
 		/* call default completion routine if it's valid */
 		if (comprout) {
-			((int (*)(u_char *, u_char*, int)) comprout)
+			((int (*)(u_char *, u_char *, int)) comprout)
 			    (buffer, compdata, cmd);
 #if 0
 #ifdef __NetBSD__
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index 49952497b99..c88d0a518f7 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: apm.c,v 1.4 2002/03/14 03:15:55 millert Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -245,7 +245,7 @@ apmioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			error = EBADF;
 		else {
-			int flag = *(int*)data;
+			int flag = *(int *)data;
 			DPRINTF(( "APM_IOC_PRN_CTL: %d\n", flag ));
 			switch (flag) {
 			case APM_PRINT_ON:	/* enable printing */
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index fff9bda75c1..7acbf97a4a6 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.15 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.16 2002/03/14 03:15:55 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -169,7 +169,7 @@ openpic_attach(parent, self, aux)
 
 #if 1
 	mac_intr_establish(parent, 0x37, IST_LEVEL,
-		IPL_HIGH, openpic_prog_button, (void*)0x37, "prog button");
+		IPL_HIGH, openpic_prog_button, (void *)0x37, "prog button");
 #endif
 	ppc_intr_enable(1);
 
diff --git a/sys/arch/macppc/dev/uni_n.c b/sys/arch/macppc/dev/uni_n.c
index 8c8d8fd6022..759bf2fe3f1 100644
--- a/sys/arch/macppc/dev/uni_n.c
+++ b/sys/arch/macppc/dev/uni_n.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uni_n.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: uni_n.c,v 1.4 2002/03/14 03:15:55 millert Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Dale Rahn. All rights reserved.
@@ -108,7 +108,7 @@ uni_n_config(int handle)
 			if (OF_getprop(handle, "reg", &address,
 			    sizeof address) > 0) {
 				baseaddr = mapiodev(address, NBPG);
-				ctladdr = (void*)(baseaddr + 0x20);
+				ctladdr = (void *)(baseaddr + 0x20);
 				*ctladdr |= 0x02;
 				return baseaddr;
 			}
diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h
index 43bd20ccbac..7d22035bf07 100644
--- a/sys/arch/macppc/dev/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viareg.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: viareg.h,v 1.3 2002/03/14 03:15:55 millert Exp $	*/
 /*	$NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $	*/
 
 /*-
@@ -235,10 +235,10 @@ void	via_init(void);
 int	rbv_vidstatus(void);
 void	via_shutdown(void);
 void	via_set_modem(int);
-int	add_nubus_intr   __P((int, void (*)(void *, int), void *));
+int	add_nubus_intr(int, void (*)(void *, int), void *);
 void	enable_nubus_intr(void);
-void	via1_register_irq __P((int, void (*)(void *), void *));
-void	via2_register_irq __P((int, void (*)(void *), void *));
+void	via1_register_irq(int, void (*)(void *), void *);
+void	via2_register_irq(int, void (*)(void *), void *);
 
 extern void	(*via1itab[7])(void *);
 extern void	(*via2itab[7])(void *);
diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index 137191816bb..643537699f9 100644
--- a/sys/arch/macppc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.3 2002/03/14 01:26:36 millert Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.4 2002/03/14 03:15:55 millert Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -93,15 +93,15 @@ struct confargs {
 
 };
 
-void	set_clockintr __P((void (*)(struct clockframe *)));
-void	set_iointr __P((void (*)(void *, int)));
+void	set_clockintr(void (*)(struct clockframe *));
+void	set_iointr(void (*)(void *, int));
 int	badaddr(void *, u_int32_t);
 void calc_delayconst(void);
 void ofrootfound(void);
 
 typedef int mac_intr_handle_t;
-typedef void     *(intr_establish_t) __P((void *, mac_intr_handle_t,
-    int, int, int (*func)(void *), void *, char *));
+typedef void     *(intr_establish_t)(void *, mac_intr_handle_t,
+    int, int, int (*func)(void *), void *, char *);
 typedef void     (intr_disestablish_t)(void *, void *);
 
 intr_establish_t mac_intr_establish;
diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h
index e5cb3674d17..12deaff95c6 100644
--- a/sys/arch/macppc/include/powerpc.h
+++ b/sys/arch/macppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powerpc.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: powerpc.h,v 1.3 2002/03/14 03:15:55 millert Exp $	*/
 /*	$NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ extern  struct firmware *fw;
 void ofwconprobe(void);
 int ppc_open_pci_bridge(void);
 void ppc_close_pci_bridge(int);
-void install_extint __P((void (*handler) (void)));
+void install_extint(void (*handler) (void));
 void ppc_intr_enable(int enable);
 int ppc_intr_disable(void);
 
diff --git a/sys/arch/macppc/macppc/db_memrw.c b/sys/arch/macppc/macppc/db_memrw.c
index d8dc2405755..df6a8507e48 100644
--- a/sys/arch/macppc/macppc/db_memrw.c
+++ b/sys/arch/macppc/macppc/db_memrw.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: db_memrw.c,v 1.4 2001/05/18 20:38:27 matt Exp $	*/
-/*	$OpenBSD: db_memrw.c,v 1.3 2001/11/06 19:53:15 miod Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.4 2002/03/14 03:15:56 millert Exp $	*/
 
 /* 
  * Mach Operating System
@@ -58,7 +58,7 @@ db_read_bytes(addr, size, data)
 	register size_t	size;
 	register char	*data;
 {
-	register char	*src = (char*)addr;
+	register char	*src = (char *)addr;
 	faultbuf env;
 	faultbuf *old_onfault = curpcb->pcb_onfault;
 	if (setfault(env)) {
@@ -67,9 +67,9 @@ db_read_bytes(addr, size, data)
 	}
 
 	if (size == 4) {
-		*((int*)data) = *((int*)src);
+		*((int *)data) = *((int *)src);
 	} else if (size == 2) {
-		*((short*)data) = *((short*)src);
+		*((short *)data) = *((short *)src);
 	} else {
 		while (size > 0) {
 			--size;
@@ -98,9 +98,9 @@ db_write_bytes(addr, size, data)
 	}
 
 	if (size == 4) {
-		*((int*)dst) = *((int*)data);
+		*((int *)dst) = *((int *)data);
 	} else if (size == 2) {
-		*((short*)dst) = *((short*)data);
+		*((short *)dst) = *((short *)data);
 	} else  {
 		while (size > 0) {
 			--size;
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 5ed759c7b5c..7900f832b39 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.29 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.30 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -168,8 +168,8 @@ int power4e_get_eth_addr(void);
 void nameinterrupt(int replace, char *newstr);
 void ppc_intr_setup(intr_establish_t *establish,
     intr_disestablish_t *disestablish);
-void *ppc_intr_establish __P((void *lcv, pci_intr_handle_t ih, int type,
-    int level, int (*func)(void *), void *arg, char *name));
+void *ppc_intr_establish(void *lcv, pci_intr_handle_t ih, int type,
+    int level, int (*func)(void *), void *arg, char *name);
 int bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int cacheable,
     bus_space_handle_t *bshp);
 
@@ -690,7 +690,7 @@ setregs(p, pack, stack, retval)
 	pargs = -roundup(-stack + 8, 16);
 	newstack = (u_int32_t)(pargs - 32);
 
-	copyin ((void*)(VM_MAX_ADDRESS-0x10), &args, 0x10);
+	copyin ((void *)(VM_MAX_ADDRESS-0x10), &args, 0x10);
 
 	bzero(tf, sizeof *tf);
 	tf->fixreg[1] = newstack;
@@ -1287,7 +1287,7 @@ mapiodev(pa, len)
 		spa += PAGE_SIZE;
 		vaddr += PAGE_SIZE;
 	}
-	return (void*) (va+off);
+	return (void *) (va+off);
 }
 void
 unmapiodev(kva, p_size)
diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c
index b70fe629442..c8333b619a5 100644
--- a/sys/arch/macppc/macppc/mainbus.c
+++ b/sys/arch/macppc/macppc/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.4 2002/03/14 03:15:56 millert Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -52,7 +52,7 @@ struct cfdriver mainbus_cd = {
 	NULL, "mainbus", DV_DULL, NULL, 0
 };
 
-void	mb_intr_establish __P((struct confargs *, int (*)(void *), void *));
+void	mb_intr_establish(struct confargs *, int (*)(void *), void *);
 void	mb_intr_disestablish(struct confargs *);
 caddr_t	mb_cvtaddr(struct confargs *);
 int	mb_matchname(struct confargs *, char *);
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index 47ff27afab2..32411cc17f3 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macobio.c,v 1.3 2002/03/14 01:26:37 millert Exp $	*/
+/*	$OpenBSD: macobio.c,v 1.4 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $	*/
 
 /*-
@@ -49,8 +49,8 @@
 void macobio_attach(struct device *, struct device *, void *);
 int macobio_match(struct device *, void *, void *);
 int macobio_print(void *, const char *);
-void *undef_mac_establish __P((void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name));
+void *undef_mac_establish(void * lcv, int irq, int type, int level,
+    int (*ih_fun)(void *), void *ih_arg, char *name);
 void mac_intr_disestab(void *lcp, void *arg);
 
 struct macobio_softc {
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index 4899cf4ba72..29fe192b517 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.9 2002/03/14 03:15:56 millert Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -78,8 +78,8 @@ void	 mpc_conf_write(void *, pcitag_t, int, pcireg_t);
 int      mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *mpc_intr_string(void *, pci_intr_handle_t);
 int	 mpc_intr_line(void *, pci_intr_handle_t);
-void     *mpc_intr_establish __P((void *, pci_intr_handle_t,
-            int, int (*func)(void *), void *, char *));
+void     *mpc_intr_establish(void *, pci_intr_handle_t,
+            int, int (*func)(void *), void *, char *);
 void     mpc_intr_disestablish(void *, void *);
 int      mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 u_int32_t mpc_gen_config_reg(void *cpv, pcitag_t tag, int offset);
diff --git a/sys/arch/macppc/pci/vgafbvar.h b/sys/arch/macppc/pci/vgafbvar.h
index cfb9cd1c7aa..79e5042655f 100644
--- a/sys/arch/macppc/pci/vgafbvar.h
+++ b/sys/arch/macppc/pci/vgafbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafbvar.h,v 1.3 2002/03/14 01:26:37 millert Exp $	*/
+/*	$OpenBSD: vgafbvar.h,v 1.4 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: vgavar.h,v 1.2 1996/11/23 06:06:43 cgd Exp $	*/
 
 /*
@@ -81,5 +81,5 @@ paddr_t	vgafb_mmap(void *, off_t, int);
 int	vgafb_alloc_screen(void *v, const struct wsscreen_descr *type,
 	    void **cookiep, int *curxp, int *curyp, long *attrp);
 void	vgafb_free_screen(void *v, void *cookie);
-int	vgafb_show_screen __P((void *v, void *cookie, int waitok,
-	    void (*cb)(void *, int, int), void *cbarg));
+int	vgafb_show_screen(void *v, void *cookie, int waitok,
+	    void (*cb)(void *, int, int), void *cbarg);
diff --git a/sys/arch/macppc/stand/alloc.c b/sys/arch/macppc/stand/alloc.c
index f6b6f65cc16..2c49b93adb6 100644
--- a/sys/arch/macppc/stand/alloc.c
+++ b/sys/arch/macppc/stand/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.1 2001/09/01 15:39:02 drahn Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.2 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: alloc.c,v 1.1 1997/04/16 20:29:16 thorpej Exp $	*/
 
 /*
@@ -181,7 +181,7 @@ free(ptr, size)
 	void *ptr;
 	unsigned size;	/* only for consistenct check */
 {
-	register struct ml *a = (struct ml *)((char*)ptr - OVERHEAD);
+	register struct ml *a = (struct ml *)((char *)ptr - OVERHEAD);
 
 #ifdef ALLOC_TRACE
 	printf("free(%lx, %u) (origsize %u)\n", (u_long)ptr, size, a->size);
diff --git a/sys/arch/macppc/stand/boot.c b/sys/arch/macppc/stand/boot.c
index 906e5f3222b..43b296e19df 100644
--- a/sys/arch/macppc/stand/boot.c
+++ b/sys/arch/macppc/stand/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.4 2002/03/14 01:26:37 millert Exp $	*/
+/*	$OpenBSD: boot.c,v 1.5 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: boot.c,v 1.1 1997/04/16 20:29:17 thorpej Exp $	*/
 
 /*
@@ -245,7 +245,7 @@ main()
 	ssym = (void *)marks[MARK_SYM];
 	esym = (void *)marks[MARK_END];
 
-	chain ((void*)entry, bootline, ssym, esym);
+	chain ((void *)entry, bootline, ssym, esym);
 
 	_rtt();
 	return 0;
diff --git a/sys/arch/macppc/stand/openfirm.h b/sys/arch/macppc/stand/openfirm.h
index b1cd3fefad3..b374e8df782 100644
--- a/sys/arch/macppc/stand/openfirm.h
+++ b/sys/arch/macppc/stand/openfirm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.h,v 1.2 2002/03/14 01:26:37 millert Exp $	*/
+/*	$OpenBSD: openfirm.h,v 1.3 2002/03/14 03:15:56 millert Exp $	*/
 /*	$NetBSD: openfirm.h,v 1.1 1997/04/16 20:29:23 thorpej Exp $	*/
 
 /*
@@ -52,5 +52,5 @@ int OF_seek(int handle, u_quad_t pos);
 void *OF_claim(void *virt, u_int size, u_int align);
 void OF_release(void *virt, u_int size);
 int OF_milliseconds(void);
-void OF_chain __P((void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen));
+void OF_chain(void *addr, u_int size, void (*entry)(), void *parm, u_int parmlen);