First round of __P removal in sys

15 files changed, 136 insertions, 136 deletions

diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h
index bb03f2fc41f..62b095b3664 100644
--- a/sys/arch/sun3/include/autoconf.h
+++ b/sys/arch/sun3/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.7 1997/01/16 04:04:04 kstailey Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.8 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.12 1996/11/20 18:57:05 gwr Exp $	*/
 
 /*-
@@ -62,19 +62,19 @@ struct confargs {
 #define cf_intpri	cf_loc[1]
 #define cf_intvec	cf_loc[2]
 
-int bus_scan __P((struct device *, void *, void *));
-int bus_print __P((void *, const char *));
-int bus_peek __P((int, int, int));
-char * bus_mapin __P((int, int, int));
+int bus_scan(struct device *, void *, void *);
+int bus_print(void *, const char *);
+int bus_peek(int, int, int);
+char * bus_mapin(int, int, int);
 
-typedef int (*isr_func_t) __P((void *));
-void isr_add_custom __P((int, void *));
-void isr_add_autovect __P((isr_func_t, void *arg, int level));
-void isr_add_vectored __P((isr_func_t, void *arg, int pri, int vec));
+typedef int (*isr_func_t)(void *);
+void isr_add_custom(int, void *);
+void isr_add_autovect(isr_func_t, void *arg, int level);
+void isr_add_vectored(isr_func_t, void *arg, int pri, int vec);
 
-void isr_soft_request __P((int level));
-void isr_soft_clear __P((int level));
+void isr_soft_request(int level);
+void isr_soft_clear(int level);
 
 /* Bus-error tolerant access to mapped address. */
-int     peek_byte __P((caddr_t));
-int     peek_word __P((caddr_t));
+int     peek_byte(caddr_t);
+int     peek_word(caddr_t);
diff --git a/sys/arch/sun3/include/control.h b/sys/arch/sun3/include/control.h
index ddde823e01c..c7c5854f5bf 100644
--- a/sys/arch/sun3/include/control.h
+++ b/sys/arch/sun3/include/control.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.h,v 1.5 1997/09/21 04:21:06 niklas Exp $	*/
+/*	$OpenBSD: control.h,v 1.6 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: control.h,v 1.14 1996/11/20 18:57:06 gwr Exp $	*/
 
 /*-
@@ -85,18 +85,18 @@
 
 #include <sys/types.h>
 
-unsigned char get_control_byte __P((char *));
-unsigned int get_control_word __P((char *));
-void set_control_byte __P((char *, unsigned char));
-void set_control_word __P((char *, unsigned int));
+unsigned char get_control_byte(char *);
+unsigned int get_control_word(char *);
+void set_control_byte(char *, unsigned char);
+void set_control_word(char *, unsigned int);
 
-int get_context __P((void));
-void set_context __P((int));
+int get_context(void);
+void set_context(int);
      
-vm_offset_t get_pte __P((vm_offset_t va));
-void set_pte __P((vm_offset_t, vm_offset_t));
+vm_offset_t get_pte(vm_offset_t va);
+void set_pte(vm_offset_t, vm_offset_t);
      
-unsigned char get_segmap __P((vm_offset_t));
-void set_segmap __P((vm_offset_t va, unsigned char));
-void set_segmap_allctx __P((vm_offset_t va, unsigned char));
+unsigned char get_segmap(vm_offset_t);
+void set_segmap(vm_offset_t va, unsigned char);
+void set_segmap_allctx(vm_offset_t va, unsigned char);
 
diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index 0c7d910b1e4..c4b85a7a936 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.14 2001/11/06 18:41:10 art Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.15 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: cpu.h,v 1.20 1995/12/21 05:02:10 mycroft Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ extern int want_resched; /* resched() was called */
  * isr_soft_request() so this scheme just multiplexes four
  * software interrupt `sources' on the level one handler.
  */
-extern void isr_soft_request __P((int level));
+extern void isr_soft_request(int level);
 union sun3sir {
 	int 	sir_any;
 	char	sir_which[4];
@@ -147,15 +147,15 @@ union sun3sir {
 extern	unsigned char cpu_machine_id;
 
 /* dma.c */
-long	dvma_kvtopa __P((long, int));
+long	dvma_kvtopa(long, int);
 
 /* machdep.c */
-void	dumpconf __P((void));
+void	dumpconf(void);
 
 struct pcb;
-void	savectx __P((struct pcb *));
-void	switch_exit __P((struct proc *));
-void	proc_trampoline __P((void));
+void	savectx(struct pcb *);
+void	switch_exit(struct proc *);
+void	proc_trampoline(void);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/arch/sun3/include/cpufunc.h b/sys/arch/sun3/include/cpufunc.h
index 20c32f11420..cc5688fa516 100644
--- a/sys/arch/sun3/include/cpufunc.h
+++ b/sys/arch/sun3/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.3 1997/09/21 04:21:07 niklas Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.4 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.6 1996/11/20 18:57:07 gwr Exp $	*/
 
 /*-
@@ -41,5 +41,5 @@
  * Functions to provide access to special 68k instructions.
  */
 
-unsigned int *getvbr __P((void));
-void setvbr __P((unsigned int *));
+unsigned int *getvbr(void);
+void setvbr(unsigned int *);
diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h
index fcf395331a2..32e16665fc5 100644
--- a/sys/arch/sun3/include/db_machdep.h
+++ b/sys/arch/sun3/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.4 1997/01/16 04:04:06 kstailey Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.5 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.7 1995/02/07 04:34:45 gwr Exp $	*/
 
 #include <m68k/db_machdep.h>
@@ -6,9 +6,9 @@
 /* This enables some code in db_command.c */
 #define DB_MACHINE_COMMANDS
 
-void db_machine_init __P((void));
-void ddb_init __P((void));
+void db_machine_init(void);
+void ddb_init(void);
 
 /* These are in db_memrw.c */
-extern void db_read_bytes  __P((vm_offset_t addr, size_t size, char *data));
-extern void db_write_bytes __P((vm_offset_t addr, size_t size, char *data));
+extern void db_read_bytes(vm_offset_t addr, size_t size, char *data);
+extern void db_write_bytes(vm_offset_t addr, size_t size, char *data);
diff --git a/sys/arch/sun3/include/dvma.h b/sys/arch/sun3/include/dvma.h
index 9ebbdbe3bc8..2944477d965 100644
--- a/sys/arch/sun3/include/dvma.h
+++ b/sys/arch/sun3/include/dvma.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvma.h,v 1.6 1997/01/16 04:04:06 kstailey Exp $	*/
+/*	$OpenBSD: dvma.h,v 1.7 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: dvma.h,v 1.4 1996/11/20 18:57:08 gwr Exp $	*/
 
 /*-
@@ -76,7 +76,7 @@
 #define	DVMA_SPACE_START	0x0FF00000
 #define DVMA_SPACE_END  	0x0FFFE000
 
-void dvma_init __P((void));
+void dvma_init(void);
 
 /* Allocate/free actual pages of DVMA space. */
 caddr_t dvma_malloc(size_t bytes);
diff --git a/sys/arch/sun3/include/eeprom.h b/sys/arch/sun3/include/eeprom.h
index 6f6dbba9db7..8f1fcee2862 100644
--- a/sys/arch/sun3/include/eeprom.h
+++ b/sys/arch/sun3/include/eeprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eeprom.h,v 1.2 1996/10/12 08:27:14 deraadt Exp $	*/
+/*	$OpenBSD: eeprom.h,v 1.3 2002/03/14 01:26:46 millert Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -360,5 +360,5 @@ struct eeprom {
 
 #ifdef _KERNEL
 extern	char *eeprom_va;
-int	eeprom_uio __P((struct uio *));
+int	eeprom_uio(struct uio *);
 #endif /* _KERNEL */
diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h
index 50cd844a2d5..d09a62262dd 100644
--- a/sys/arch/sun3/include/idprom.h
+++ b/sys/arch/sun3/include/idprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: idprom.h,v 1.5 1997/01/16 04:04:07 kstailey Exp $	*/
+/*	$OpenBSD: idprom.h,v 1.6 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: idprom.h,v 1.12 1996/11/20 18:57:10 gwr Exp $	*/
 
 /*-
@@ -58,7 +58,7 @@ struct idprom {
 
 extern struct idprom identity_prom;
 
-int  idprom_init __P((void));
-void idprom_etheraddr __P((u_char *));
+int  idprom_init(void);
+void idprom_etheraddr(u_char *);
 
 #endif
diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h
index 51f20b4e3c4..da3f744ed42 100644
--- a/sys/arch/sun3/include/machdep.h
+++ b/sys/arch/sun3/include/machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.h,v 1.16 2001/11/06 18:41:10 art Exp $	*/
+/*	$OpenBSD: machdep.h,v 1.17 2002/03/14 01:26:46 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -73,67 +73,67 @@ extern vm_offset_t avail_start, avail_end;
 /* The "hole" (used to skip the Sun3/50 video RAM) */
 extern vm_offset_t hole_start, hole_size;
 
-void	ICIA __P((void));
-void	DCIA __P((void));
-void	DCIU __P((void));
+void	ICIA(void);
+void	DCIA(void);
+void	DCIU(void);
 
-void	cache_enable __P((void));
+void	cache_enable(void);
 void	cache_flush_page(vm_offset_t pgva);
 void	cache_flush_segment(vm_offset_t sgva);
 void	cache_flush_context(void);
 
-int 	cachectl __P((int req, caddr_t addr, int len));
+int 	cachectl(int req, caddr_t addr, int len);
 
-void	cninit __P((void));
+void	cninit(void);
 
-void	dumpconf __P((void));
-void	dumpsys __P((void));
+void	dumpconf(void);
+void	dumpsys(void);
 
-void	fb_unblank __P((void));
+void	fb_unblank(void);
 
-int 	fpu_emulate __P((struct frame *, struct fpframe *));
+int 	fpu_emulate(struct frame *, struct fpframe *);
 
 /* Backward compatibility... */
 #define getsr	_getsr
 
-void**	getvbr __P((void));
+void**	getvbr(void);
 
-vm_offset_t high_segment_alloc __P((int npages));
+vm_offset_t high_segment_alloc(int npages);
 
-void	initfpu __P((void));
+void	initfpu(void);
 
-void	intreg_init __P((void));
+void	intreg_init(void);
 
-void	isr_init __P((void));
-void	isr_config __P((void));
+void	isr_init(void);
+void	isr_config(void);
 
-void	m68881_save __P((struct fpframe *));
-void	m68881_restore __P((struct fpframe *));
+void	m68881_save(struct fpframe *);
+void	m68881_restore(struct fpframe *);
 
-void	proc_do_uret __P((void));
-void	proc_trampoline __P((void));
+void	proc_do_uret(void);
+void	proc_trampoline(void);
 
-void	pmap_bootstrap __P((void));
-vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int));
-int 	pmap_fault_reload __P((struct pmap *, vm_offset_t, int));
-void	pmap_get_ksegmap __P((u_char *));
-void	pmap_get_pagemap __P((int *pt, int off));
+void	pmap_bootstrap(void);
+vm_offset_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int);
+int 	pmap_fault_reload(struct pmap *, vm_offset_t, int);
+void	pmap_get_ksegmap(u_char *);
+void	pmap_get_pagemap(int *pt, int off);
 
-int	reboot2 __P((int, char *));
+int	reboot2(int, char *);
 
-void	savectx __P((struct pcb *));
+void	savectx(struct pcb *);
 
-void	setvbr __P((void **));
+void	setvbr(void **);
 
-void	sun3_mon_abort __P((void));
-void	sun3_mon_halt __P((void));
-void	sun3_mon_reboot __P((char *));
-void	sun3_pmeg_init __P((void));
-void	sun3_reserve_pmeg __P((int pmeg_num));
+void	sun3_mon_abort(void);
+void	sun3_mon_halt(void);
+void	sun3_mon_reboot(char *);
+void	sun3_pmeg_init(void);
+void	sun3_reserve_pmeg(int pmeg_num);
 
-void	swapconf __P((void));
-void	swapgeneric __P((void));
+void	swapconf(void);
+void	swapgeneric(void);
 
-void	switch_exit __P((struct proc *));
+void	switch_exit(struct proc *);
 
 #endif	/* _KERNEL */
diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h
index d142f001e57..bb1dcc2f69f 100644
--- a/sys/arch/sun3/include/mon.h
+++ b/sys/arch/sun3/include/mon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mon.h,v 1.5 1997/01/16 04:04:08 kstailey Exp $	*/
+/*	$OpenBSD: mon.h,v 1.6 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $	*/
 
 /*-
@@ -106,7 +106,7 @@ typedef struct bootparam {
 typedef struct {
 	char	*initSp;		/* Initial system stack ptr
 					 * for hardware */
-	int	(*startMon)__P((void));	/* Initial PC for hardware */
+	int	(*startMon)(void);	/* Initial PC for hardware */
 
 	int	*diagberr;		/* Bus err handler for diags */
 
@@ -121,10 +121,10 @@ typedef struct {
 	 * Single-character input and output
 	 */
 
-	u_char	(*getChar)__P((void));	/* Get char from input source */
-	int	(*putChar)__P((int));	/* Put char to output sink */
-	int	(*mayGet)__P((void));	/* Maybe get char, or -1 */
-	int	(*mayPut)__P((int));	/* Maybe put char, or -1 */
+	u_char	(*getChar)(void);	/* Get char from input source */
+	int	(*putChar)(int);	/* Put char to output sink */
+	int	(*mayGet)(void);	/* Maybe get char, or -1 */
+	int	(*mayPut)(int);	/* Maybe put char, or -1 */
 	u_char	*echo;			/* Should getchar echo? */
 	u_char	*inSource;		/* Input source selector */
 	u_char	*outSink;		/* Output sink selector */
@@ -133,8 +133,8 @@ typedef struct {
 	 * Keyboard input (scanned by monitor nmi routine)
 	 */
 
-	int	(*getKey)__P((void));		/* Get next key if one exists */
-	int	(*initGetKey)__P((void*));	/* Initialize get key */
+	int	(*getKey)(void);		/* Get next key if one exists */
+	int	(*initGetKey)(void*);	/* Initialize get key */
 	u_int	*translation;			/* Kbd translation selector
 						   (see keyboard.h in sun
 						    monitor code) */
@@ -153,18 +153,18 @@ typedef struct {
 	 * Frame buffer output and terminal emulation
 	 */
 
-	int	(*fbWriteChar)__P((int)); /* Write a character to FB */
+	int	(*fbWriteChar)(int); /* Write a character to FB */
 	int	*fbAddr;		/* Address of frame buffer */
 	char	**font;			/* Font table for FB */
 	/* Quickly write string to FB */
-	int	(*fbWriteStr)__P((char *buf, int len));
+	int	(*fbWriteStr)(char *buf, int len);
 
 	/*
 	 * Reboot interface routine -- resets and reboots system.  No return.
 	 * XXX should this be declared volatile?
 	 */
 
-	int	(*reBoot)__P((char *));	/* e.g. reBoot("sd()bsd") */
+	int	(*reBoot)(char *);	/* e.g. reBoot("sd()bsd") */
 
 	/*
 	 * Line input and parsing
@@ -173,32 +173,32 @@ typedef struct {
 	u_char	*lineBuf;			/* The line input buffer */
 	u_char	**linePtr;			/* Cur pointer into linebuf */
 	int	*lineSize;			/* length of line in linebuf */
-	int	(*getLine)__P((int));		/* Get line from user */
-	u_char	(*getNextChar)__P((void));	/* Get next char from linebuf */
-	u_char	(*peekNextChar)__P((void));	/* Peek at next char */
+	int	(*getLine)(int);		/* Get line from user */
+	u_char	(*getNextChar)(void);	/* Get next char from linebuf */
+	u_char	(*peekNextChar)(void);	/* Peek at next char */
 	int	*fbThere;			/* =1 if frame buffer there */
-	int	(*getNum)__P((void));		/* Grab hex num from line */
+	int	(*getNum)(void);		/* Grab hex num from line */
 
 	/*
 	 * Print formatted output to current output sink
 	 */
 
-	int	(*printf)__P((char *, ...));	/* Similar to "Kernel printf" */
-	int	(*printHex)__P((int,int));	/* Format N digits in hex */
+	int	(*printf)(char *, ...);	/* Similar to "Kernel printf" */
+	int	(*printHex)(int,int);	/* Format N digits in hex */
 
 	/*
 	 * Led stuff
 	 */
 
 	u_char	*leds;				/* RAM copy of LED register */
-	int	(*setLeds)__P((int));		/* Sets LED's and RAM copy */
+	int	(*setLeds)(int);		/* Sets LED's and RAM copy */
 
 	/*
 	 * Non-maskable interrupt  (nmi) information
 	 */
 
-	int	(*nmiAddr)__P((void*));		/* Addr for level 7 vector */
-	int	(*abortEntry)__P((void*));	/* Entry for keyboard abort */
+	int	(*nmiAddr)(void*);		/* Addr for level 7 vector */
+	int	(*abortEntry)(void*);	/* Entry for keyboard abort */
 	int	*nmiClock;			/* Counts up in msec */
 
 	/*
@@ -221,10 +221,10 @@ typedef struct {
 	long	*resetAddr;			/* where to jump on a reset */
 	long	*resetMap;			/* pgmap entry for resetaddr */
 						/* Really struct pgmapent *  */
-	int	(*exitToMon)__P((void));	/* Exit from user program */
+	int	(*exitToMon)(void);	/* Exit from user program */
 	u_char	**memorybitmap;			/* V1: &{0 or &bits} */
-	void	(*setcxsegmap)__P((int,int,int)); /* Set seg in any context */
-	void	(**vector_cmd)__P((int, char*)); /* V2: Handler for 'v' cmd */
+	void	(*setcxsegmap)(int,int,int); /* Set seg in any context */
+	void	(**vector_cmd)(int, char*); /* V2: Handler for 'v' cmd */
 	int	dummy1z;
 	int	dummy2z;
 	int	dummy3z;
diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h
index f8d8c3b9a39..01a7be77faa 100644
--- a/sys/arch/sun3/include/obio.h
+++ b/sys/arch/sun3/include/obio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obio.h,v 1.7 2000/08/28 22:04:22 miod Exp $	*/
+/*	$OpenBSD: obio.h,v 1.8 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: obio.h,v 1.16 1996/11/20 18:57:14 gwr Exp $	*/
 
 /*-
@@ -77,15 +77,15 @@
 
 #ifdef	_KERNEL
 
-caddr_t obio_alloc __P((int, int));
-caddr_t obio_vm_alloc __P((int));
-caddr_t obio_find_mapping __P((int pa, int size));
+caddr_t obio_alloc(int, int);
+caddr_t obio_vm_alloc(int);
+caddr_t obio_find_mapping(int pa, int size);
 
 /* routines called during earily startup */
-void obio_init __P((void));
-void zs_init __P((void));
-void eeprom_init __P((void));
-void intreg_init __P((void));
-void clock_init __P((void));
+void obio_init(void);
+void zs_init(void);
+void eeprom_init(void);
+void intreg_init(void);
+void clock_init(void);
 
 #endif	/* _KERNEL */
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index 85c0f2231c0..714ad6151e3 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.29 2001/12/05 01:57:15 provos Exp $	*/
+/*	$OpenBSD: param.h,v 1.30 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $	*/
 
 /*
@@ -93,7 +93,7 @@
 #if defined(_KERNEL) && !defined(_LOCORE)
 #include <machine/cpu.h>
 
-extern void _delay __P((unsigned));
+extern void _delay(unsigned);
 #define delay(us)	_delay((us)<<8)
 #define	DELAY(n)	delay(n)
 #endif	/* _KERNEL && !_LOCORE */
diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h
index 21670f5f7e5..14a04f3e825 100644
--- a/sys/arch/sun3/include/pmap.h
+++ b/sys/arch/sun3/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.12 2001/12/05 00:11:51 millert Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.13 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: pmap.h,v 1.18 1997/01/27 19:41:06 gwr Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@ extern struct pmap	kernel_pmap_store;
 #define	pmap_kernel()			(&kernel_pmap_store)
 
 /* This is called from locore.s:cpu_switch() */
-void pmap_switch __P((pmap_t pmap));
+void pmap_switch(pmap_t pmap);
 
 /* This lets us have some say in choosing VA locations. */
 extern void pmap_prefer(vm_offset_t, vm_offset_t *);
diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h
index 605c941115c..d6a5029747f 100644
--- a/sys/arch/sun3/include/psl.h
+++ b/sys/arch/sun3/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.11 2001/11/23 00:47:47 miod Exp $	*/
+/*	$OpenBSD: psl.h,v 1.12 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: psl.h,v 1.14 1998/11/24 17:07:54 kleink Exp $	*/
 
 /*-
@@ -48,9 +48,9 @@
 
 #ifndef __GNUC__
 /* No inline, use the real functions in locore.s */
-extern int _getsr __P((void));
-extern int _spl __P((int new));
-extern int _splraise __P((int new));
+extern int _getsr(void);
+extern int _spl(int new);
+extern int _splraise(int new);
 #else	/* GNUC */
 /*
  * Define inline functions for PSL manipulation.
@@ -61,9 +61,9 @@ extern int _splraise __P((int new));
  * (See the GCC extensions info document.)
  */
 
-static __inline int _getsr __P((void));
-static __inline int _spl __P((int));
-static __inline int _splraise __P((int));
+static __inline int _getsr(void);
+static __inline int _spl(int);
+static __inline int _splraise(int);
 
 /* Get current sr value. */
 static __inline int
diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h
index 5f28e10b1e1..9b60b3c8eb7 100644
--- a/sys/arch/sun3/include/z8530var.h
+++ b/sys/arch/sun3/include/z8530var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530var.h,v 1.8 2001/08/18 22:37:40 art Exp $	*/
+/*	$OpenBSD: z8530var.h,v 1.9 2002/03/14 01:26:46 millert Exp $	*/
 /*	$NetBSD: z8530var.h,v 1.5 1996/10/13 03:47:44 christos Exp $	*/
 
 /*
@@ -60,23 +60,23 @@ struct zsc_softc {
  * These could be inlines, but with the delay, speed is moot.
  */
 
-u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg));
-u_char zs_read_csr __P((struct zs_chanstate *cs));
-u_char zs_read_data __P((struct zs_chanstate *cs));
+u_char zs_read_reg(struct zs_chanstate *cs, u_char reg);
+u_char zs_read_csr(struct zs_chanstate *cs);
+u_char zs_read_data(struct zs_chanstate *cs);
 
-void  zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val));
-void  zs_write_csr __P((struct zs_chanstate *cs, u_char val));
-void  zs_write_data __P((struct zs_chanstate *cs, u_char val));
+void  zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val);
+void  zs_write_csr(struct zs_chanstate *cs, u_char val);
+void  zs_write_data(struct zs_chanstate *cs, u_char val);
 
 
 /*
  * How to request a "soft" interrupt.
  * This could be a macro if you like.
  */
-void zsc_req_softint __P((struct zsc_softc *zsc));
+void zsc_req_softint(struct zsc_softc *zsc);
 
 /* Handle user request to enter kernel debugger. */
-void zs_abort __P((void));
+void zs_abort(void);
 
 /*
  * Some warts needed by z8530tty.c -