Final __P removal plus some cosmetic fixups

11 files changed, 30 insertions, 31 deletions

diff --git a/sys/arch/i386/eisa/eisa_machdep.h b/sys/arch/i386/eisa/eisa_machdep.h
index b1746e33ed8..a313d805fae 100644
--- a/sys/arch/i386/eisa/eisa_machdep.h
+++ b/sys/arch/i386/eisa/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:32 millert Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.5 2002/03/14 03:15:53 millert Exp $	*/
 /*	$NetBSD: eisa_machdep.h,v 1.4 1997/06/06 23:12:52 thorpej Exp $	*/
 
 /*
@@ -60,7 +60,6 @@ int		eisa_maxslots(eisa_chipset_tag_t);
 int		eisa_intr_map(eisa_chipset_tag_t, u_int,
 		    eisa_intr_handle_t *);
 const char	*eisa_intr_string(eisa_chipset_tag_t, eisa_intr_handle_t);
-void		*eisa_intr_establish __P((eisa_chipset_tag_t,
-		    eisa_intr_handle_t, int, int, int (*)(void *), void *,
-		    char *));
+void		*eisa_intr_establish(eisa_chipset_tag_t, eisa_intr_handle_t,
+		    int, int, int (*)(void *), void *, char *);
 void		eisa_intr_disestablish(eisa_chipset_tag_t, void *);
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 236b226745e..b83b1a52369 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.52 2002/03/14 01:26:32 millert Exp $	*/
+/*	$OpenBSD: apm.c,v 1.53 2002/03/14 03:15:53 millert Exp $	*/
 
 /*-
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -1022,7 +1022,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/i386/i386/math_emulate.c b/sys/arch/i386/i386/math_emulate.c
index b8df8fef771..d51efca8c81 100644
--- a/sys/arch/i386/i386/math_emulate.c
+++ b/sys/arch/i386/i386/math_emulate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: math_emulate.c,v 1.4 1996/05/07 07:21:48 deraadt Exp $	*/
+/*	$OpenBSD: math_emulate.c,v 1.5 2002/03/14 03:15:53 millert Exp $	*/
 /*	$NetBSD: math_emulate.c,v 1.17 1996/05/03 19:42:17 christos Exp $	*/
 
 /*
@@ -580,7 +580,7 @@ char * ea(struct trapframe * info, u_short code)
 		I387.fos = 0x17;
 		return (char *) offset;
 	}
-	tmp = (long*)&REG(rm);
+	tmp = (long *)&REG(rm);
 	switch (mod) {
 		case 0: offset = 0; break;
 		case 1:
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 4886c9e21fb..b83df1b7976 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.16 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.17 2002/03/14 03:15:54 millert Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $	*/
 
 /*-
@@ -109,8 +109,8 @@ void	isa_attach_hook(struct device *, struct device *,
 	    struct isabus_attach_args *);
 int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
 int	isa_intr_check(isa_chipset_tag_t, int, int);
-void	*isa_intr_establish __P((isa_chipset_tag_t ic, int irq, int type,
-	    int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what));
+void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
+	    int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what);
 void	isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
 
 /*
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 6f3e017d978..873dec344eb 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccons.c,v 1.49 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: pccons.c,v 1.50 2002/03/14 03:15:54 millert Exp $	*/
 /*	$NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $	*/
 
 /*-
@@ -691,8 +691,8 @@ pcioctl(dev, cmd, data, flag, p)
 		 * is the duration in msec.
 		 */
 		if (data)
-			sysbeep(((int*)data)[0],
-				(((int*)data)[1] * hz) / 1000);
+			sysbeep(((int *)data)[0],
+				(((int *)data)[1] * hz) / 1000);
 		else
 			sysbeep(BEEP_FREQ, BEEP_TIME);
 		return 0;
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index 553136a4529..ffdd5d9d864 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.10 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.11 2002/03/14 03:15:54 millert Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $	*/
 
 /*
@@ -92,8 +92,8 @@ int		pci_intr_map(struct pci_attach_args *,
 		    pci_intr_handle_t *);
 #define		pci_intr_line(ih)	((ih).line)
 const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
-void		*pci_intr_establish __P((pci_chipset_tag_t, pci_intr_handle_t,
-		    int, int (*)(void *), void *, char *));
+void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
+		    int, int (*)(void *), void *, char *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
 		    int *, int *, int *);
diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h
index 86d377f13c1..7934f4a761e 100644
--- a/sys/arch/i386/pci/pcibiosvar.h
+++ b/sys/arch/i386/pci/pcibiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcibiosvar.h,v 1.9 2002/03/14 01:26:33 millert Exp $	*/
+/*	$OpenBSD: pcibiosvar.h,v 1.10 2002/03/14 03:15:54 millert Exp $	*/
 /*	$NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $	*/
 
 /*
@@ -148,8 +148,8 @@ struct extent *pciaddr_search(int, bus_addr_t *, bus_size_t);
 int  pci_intr_fixup(struct pcibios_softc *, pci_chipset_tag_t, bus_space_tag_t);
 int  pci_bus_fixup(pci_chipset_tag_t, int);
 void pci_addr_fixup(struct pcibios_softc *, pci_chipset_tag_t, int);
-void pci_device_foreach __P((struct pcibios_softc *, pci_chipset_tag_t, int,
-    void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t)));
+void pci_device_foreach(struct pcibios_softc *, pci_chipset_tag_t, int,
+    void (*)(struct pcibios_softc *, pci_chipset_tag_t, pcitag_t));
 int  pci_intr_header_fixup(pci_chipset_tag_t, pcitag_t, pci_intr_handle_t *);
 int  pci_intr_route_link(pci_chipset_tag_t, pci_intr_handle_t *);
 int  pci_intr_post_fixup(void);
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index db3090fb752..46f7faa2ccb 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.53 2002/03/14 01:26:34 millert Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.54 2002/03/14 03:15:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -178,7 +178,7 @@ static __inline int
 biosd_rw(rw, dev, cyl, head, sect, nsect, buf)
 	int rw, dev, cyl, head;
 	int sect, nsect;
-	void* buf;
+	void * buf;
 {
 	int rv;
 	BIOS_regs.biosr_es = (u_int32_t)buf >> 4;
@@ -229,7 +229,7 @@ int
 biosd_io(rw, dev, cyl, head, sect, nsect, buf)
 	int rw, dev, cyl, head;
 	int sect, nsect;
-	void* buf;
+	void * buf;
 {
 	int j, error;
 	void *bb;
@@ -454,7 +454,7 @@ biosopen(struct open_file *f, ...)
 
 	/* Try for disklabel again (might be removable media) */
 	if(dip->bios_info.flags & BDI_BADLABEL){
-		const char *st = bios_getdisklabel((void*)biosdev, &dip->disklabel);
+		const char *st = bios_getdisklabel((void *)biosdev, &dip->disklabel);
 		if (debug && st)
 			printf("%s\n", st);
 
diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h
index 675d17c11cc..156519f2bb7 100644
--- a/sys/arch/i386/stand/libsa/biosdev.h
+++ b/sys/arch/i386/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.h,v 1.26 2002/03/14 01:26:34 millert Exp $	*/
+/*	$OpenBSD: biosdev.h,v 1.27 2002/03/14 03:15:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@ int biosopen(struct open_file *, ...);
 int biosclose(struct open_file *);
 int biosioctl(struct open_file *, u_long, void *);
 int bios_getdiskinfo(int, bios_diskinfo_t *);
-int biosd_io(int, int, int, int, int, int, void*);
+int biosd_io(int, int, int, int, int, int, void *);
 const char * bios_getdisklabel(bios_diskinfo_t *, struct disklabel *);
 
 /* diskprobe.c */
diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c
index 70c7bb1774e..f0de0e8c9ce 100644
--- a/sys/arch/i386/stand/libsa/cmd_i386.c
+++ b/sys/arch/i386/stand/libsa/cmd_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd_i386.c,v 1.23 2002/03/14 01:26:34 millert Exp $	*/
+/*	$OpenBSD: cmd_i386.c,v 1.24 2002/03/14 03:15:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -52,7 +52,7 @@ int Xmemory(void);
 int Xregs(void);
 
 /* From gidt.S */
-int bootbuf(void*, int);
+int bootbuf(void *, int);
 
 const struct cmd_table cmd_machine[] = {
 	{ "boot",     CMDT_CMD, Xboot },
@@ -87,7 +87,7 @@ Xboot()
 {
 #ifndef _TEST
 	int dev, part, st;
-	char buf[DEV_BSIZE], *dest = (void*)BOOTBIOS_ADDR;
+	char buf[DEV_BSIZE], *dest = (void *)BOOTBIOS_ADDR;
 
 	if(cmd.argc != 2) {
 		printf("machine boot {fd,hd}<0123>[abcd]\n");
diff --git a/sys/arch/i386/stand/libsa/debug.c b/sys/arch/i386/stand/libsa/debug.c
index d2374fea76a..5e06dd86bfb 100644
--- a/sys/arch/i386/stand/libsa/debug.c
+++ b/sys/arch/i386/stand/libsa/debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debug.c,v 1.8 2002/03/14 01:26:34 millert Exp $	*/
+/*	$OpenBSD: debug.c,v 1.9 2002/03/14 03:15:54 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -83,7 +83,7 @@ dump_regs(trapno, arg)
 			((i%4)? ' ': '\n'));
 
 	dump_mem("Code dump", (void *)*reg_values[8], 8);
-	/* %ebx (void*)((*reg_values[3] + 15) & ~0x0F) */
+	/* %ebx (void *)((*reg_values[3] + 15) & ~0x0F) */
 	dump_mem("Memory dump", (void *)0x1a000, 48);
 	dump_mem("Stack trace", (void *)(*reg_values[4]), 48);